Repo cleanup. Add missing dependencies