Cleanup after review

* Table output for partition id and index
* Remove members
* Other TODO and FIXME