Cleaning Up Some Contracts