Another Cleanup.