If it is livable and you are able to secure a tenant, I would be leaving it as is.
Unless there are mitigating circumstances for doing it earlier, I would wait a while and have these things done between tenants. Doing it this way the cost can usually be claimed as repairs and maintenance...