chore: cleanup odds and ends

Created by  Ed Langley  on May 1, 2020
XXBI32ZRZ3HGGK5WKAYWVICFLW3CKVWOAMIU35KC2IFQJZRPUFRQC
Change contents