Some cleanup for ui element stepper