API-33 Removed unused classes