using nv flush more appropriately; removing unneeded includes