Starting to clean up match endpoint