Cleanup code from previous pull request.