back on cleaning up the usage of flags.