Design Change - remove UI