Data cleanup and fixes

1. Delete columns from data
2. Fixes and tests for multi-keys
3. Fixes and tests for keyless tables