Issue# 91: Additional cleanup in the wake of the boost removal