Don't modify params; cleanup