[Shim] More cleanup