Removed deprecated import locations.