Remove unnecessary self