Issue #29: Proper cleanup of rank and buildTable