cleanup case statement leftovers