Cleaning of deprecated classes