remove Lambda, adapter for JVM7