Remove Yoptlo-specific code