Remove dead code
Make all file-local identifiers file local because that's a good thing to do.