Removed old code
Removed unnecessary login controller, fixed merge conflict in redirect view.