Very important fix for the SUS evolution..
cleaning around code..