[DF-291] Remove depricated classes