Removed old comments/code, better test coverage.