[AI-520] Added remove implementation for locations