Remove Java6 requirement