Issue 75: clean up.