Fix package.json, cleanup