Cleaned up registration controller a bit, but stopped the overall refactor.