Simplify code path
Update changelog