Clean up place matching