- remove __self and all references to it