removed legacy "todo", fixed error