Rooted out some unused classes and templates