Use Message logger instead of std::cout. Remove spurious includes. Remove commented out lines.