Cleanup FailController and UserServiceController.