Updated package.json and cleanup