Removed redundant and outdated Shim code
Added build script