Cleanup code.
Add new controller.