Clean up POM files and update versions