Cleaned up Locations Handler