remove Camp: and Merchant: from locations