Cleanup

by Norah McClintock