Got rid of unused flags