Remove more legacy code