It would have been great if this cleanup in this file would have been submitted separately.