CXX-141 general cleanup of insert_demo