Got rid of <functional> dependency