Code cleanups - use newer JDK features

[slawekjaranowski]

• use diamond operators
• use try-with-resources
• catch multiple exceptions in one block
• use Files.createTempFile instead of File.createTempFile
• drop unused classes and fields