Removed unused import
Removed test code for classes that have been moved