Remove remaining OTCleanup

Will do