Delete TODO

Move to-dos into issues