Clean up home controller.
Looking forward into this.