remove java6isms