Minor fixes
Removed unused classes