Remove obsolete classes

Remove classes that have had their functionality relocated