Does not compile on Windows, but removed more boost and converted std::bind to lambda.
Removed useless function definitions.