Removed redundant self'ies