Refactor: removed unused field
Refactor: updated maven compilier for Java 1.7; using diamond operator