Did some cleaning up.