Cleanup in poms