Cleanup package.json and update deps