more cleanup

@steved555 @pswadi-zendesk @bolddane 

### Risks
 - None