cleanup(various): Eliminate warnings, dead code