Remove Document TODOs

there are lots of TODOs. This issue deals with them.