Clean up unnessary selfs to save some bytes