Did you mean to remove this?  Just not seeing how this is relevant to the other changes.

Otherwise looks good to me.