Clean up locator serialized forms