Remove unused includes

* Remove spurious includes
* Remove commented out lines