Clean-up:
- reduce warnings
- handle TODOs: remove some, elaborate other
30 files changed