Remove remaining OTCleanup