NXBOOK-757 a bunch of cleanups and updates related to 2.7