Remove several unnecessary instances of "this"