MADS: Cleanup of UISlots and flag types