Remove explicit calls to self when not required