Removed more unused cases.