ToDo-NoEF - cleanup