1) Clean up specification of StorageLocations