Clean up registration controller and add commandbus