ongoing cleanup work & file node type emulation