Remove remaining OTCleanup

Are you missing `#include <memory>` ?