[Shim] More cleanup, added --static