Remove unnecessary usages of this