Todo deleted

- no more TODO's on the error