Remove outdated cruft