#44 Remove redundant UI