Flag model cleanup.