Code cleanup for renewal reports