ToDO-NoEF - cleanup