#18 simpleTODO removed