Cleanup some requires and contracts.