Cleaning up Auth Controller