Remove more dead/weird/misleading code.