[CLEANUP] - removed unused classes.