clean up of more legacy code