Clean up package.json and other bits