More cleanup of really old code.