More cleaning up of old dusty cruft that has accumulated as a result of starting these files with case&pasting