Why is this file being deleted? Is this a clean-up, if so, seems like it should be separate PR