Did some cleanup all over