got rid of some unnecessary flags