clean up more flags