Clean up unnessary self