Once again, remove references to contracts