Remove unnecessary checks and variables.
Merge pull request #3092 from braddunbar/history-cleanup

Remove unnecessary checks and variables.