Remove outdated class