Merge "Fix cleanup NotImplemented error"