Package cleanup and pom checkin