removed stuff i don't use