Removed redundant 'location' class because it was useless