Merge "Fix RemoveSpace memory leak."