Refactor/controller cleanup

Removed additional unneeded files and routes.