Remove java 1.7 dependency