#23 Tidy up after match