got rid of some unnecessary things