Ran some cleanup