removed case statement