cleanup case fixed