Fix fatal bug, remove UI implementation