Merge "Remove redundant this->"