replace boost::get<> call with proper function call to mapbox::variant
deactivate inactive includes
add todo marker