Remove remaining OTCleanup

Same here?