Remove unused UI
Rollback removing unused UI