Removing outdated classes