Further cleanup of POMs