Updated to latest parent pom and some cleanup