cleaning up routes and removing dependencies
fixes