Finish cleaning up flags