Remove coffee shiat.
Tidy up match controller.