removed things I'm not using