Updating route manager and removing some unused dependencies