removed stuff that is not needed