removed todo remark