Include missing dependency on yaml-cpp
Cleanup commented code