Cleanup consistency