Removed unnecessary flags