Stripping down and adding shim config according to Guy's suggestions