ECL-134 unused classes removed