Removed all flag code