Remove some unneeded selfs