removed stuff I do not use