Removed unused interfaces
All composers moved to class files