Got rid of deprecated classes