Removed old classes from #65.