removed stuff not required