Removed unused/experimental classes and interfaces