more legacy code deleted