Remove more case ranges