remove bad addition of JVM configuration options.
Undo changes from another branch which should not be in this code.
Fix missing case where adding a column which becomes the table's PK.