Intellij cleanup.

Java 7 language migration.
Remove deprecated methods for version 1.1