Command-line cleanup

- Removed FIXMEs and dead code
- Manually tested (both cmd-line and TUI), there are no tests for clients