Make package.json more consistent and remove old deps