More jvm.options cleanup and commenting