More cleanup

Created by  Nathan Jaremko  on July 17, 2020
U3SMDUIJJSCF6PX3G7M3VTDNTQZAZYNCFHIMWDM77KQQFC7EJW7AC
Change contents