Cleaning, more to go. #12