removed dependency to java 1.7
removed flagged annotation