Remove old scripts, update package deps, etc.
Resolve merge conflicts