Removed Java7 specific code