Fix package.json and cleanup