removing more stuff that isnt done