removed unnecessary cases