More POM cleanups
Put version back