Merge "Removing unused flags."