More extensive cleanup.