Modifying POM to use Jdk1.6 and cleanup