Deprecated classes cleanup