Regression: downgrade java code to java 1.6 syntax/features
Move compiler options string to resource bundle
Remove unused fields
Move strings to bundle