Remove more deadcode and some dusting.
7 files changed