Some PEP clod cleanup.