Are the changes in this file related to this feature? Or is this just a tidy up?