Merge "Remove unnecessary this->"