Removed clearing of location