Fix Eclipse project regarding Java version
Stripped down version part IV
Cleanup