removed stuff that i am not so sure about