Missing changes from last merge
Clean up and update POMs