Got rid of deprecated objects/classes