Removed code for retiring/restoring global classes