Remove shims due to break of optimisation.