Remove obsolete classes and their dependencies

This is a little scary.