move current user to own controller and clean up other shit