Remove Unnecessary Cases