removing doubleclick listener on JVM and simplification