Don't overwrite clean_kwargs with kwargs