Removing previous ui logic