removed stuff that isnt used