code cleanup; reverted back to 1.6 as default build and jvm target