removed stuff, I don't think I need