Remove unused code
Remove unused code
Add back include after bad merge fix
Fix merge screwup
Merge pull request #1001 from DonLakeFlyer/Unused

Remove unused code