Do all this cleanup in a separate PR.