Did some clean up.