Remove workarounds in ACM installation