Remove unused includes and variables

and note happily it still compiles
Merge pull request #567 from cfailde/ocd

Remove unused includes and variables