Cleanups in the new shim