removed stuff I'm not using