Removed old classes.
Minimal changes to get examples working again.