removed stuff not used by me