Use Message logger instead of std::cout. Remove spurious includes. Remov...

* Use Message logger instead of std::cout
* Remove spurious includes
* Remove commented out lines
* Use auto conditions rather then specific GT