Continued cleaning up POMs.