Remove vestiges of old Java configuration
Merge branch 'NewConfig'