Remove unneeded selfs