Misc unused code removal.