remove comments. migrate to JDK8