Updates. Removing dupes and changing project to Java 1.7