Removing some more legacy code.