BUG: removed old classes from __init__.py (was throwing an ImportError exception).