cleanup the hardcoded values for locations