gyp cleanups