remove more legacy code