nial dict cleanups