Removed superfluous selfs