Removed last of the TODO fields. I think I can probably get away with commenting them out for now as I believe they're optional. Ticket #15 regarding consumability will make sure of it.