WIP: Remove legacy UI