Cleanup + package.json