Removing unnecessary this/that refs