OK.  Should I put in a separate issue/PR to clean the other code?