removed some selfs