base_location general cleanup.