removed redundant references to self