Removed unused classes. Preparing for merge v2.0.