Clean-up of the POMs.