Modernize 5th case.
Remove 6th case.