Belatedly stop including a file that's been killed.
Remove an obsolete helper class.