Did some general purpose cleanup