Did some cleanup.