tools: cleanup after insertion of 'Location' class