clean-up, removed stuff I don't use