Removed some 'selfs'