removed unnecessary flags