Remove these redundant variables (and possibly break backward compatibility)
Support explicitely OpenJDK (#27)