Remove unneeded references to global disroot, other cleanups