cpp_v2 - lib: some more boost removed