More refactoring

- Removed obsoletes
- Tidied obvious/unused comments