removed location-specific code