Removed unnecessary "case"s