removed java 7 specific code