Removed extraneous selfs