cleanup

@dagwieers is perf without tui mode ok for you ?