re #167: Cleanup