Eliminate dead code

Part of a review of the codebase to eliminate unused code
Same as above.