removed stuff that isnt mine