Beginnings of cleanup before turning over to a research programmer.