Clean up contracts