removed stuff not needed