Fix Deps and Drop Old