2.0 spring cleaning

Clean out a whole lot of unused code and warnings.