[ronald,monica] remove unnecessary comments and cleanup pom.xml