Removing more unnessacary flags