DSGNR-5407 removed unused classes added new classes