Removed old classes

I was using them during development for copy/pasting. Now everything
they could do is possible with the new system.