Clean up, remove location