Fix inspection problems, remove dead code
Fix more inspection problems (outside of builder) and clean up ancient history