remove todos, this is pretty much finished