finished refactoring of Create New dictionary functionality, remove unuseful TODOs