Cleanup of controllers and authenticator code base