Drop create shim build

I just added changes from /src. Did I get the pull request right this time?