CAP-1520 : gui cleanup