Cleanup of event lists in progress, addressing issue #8.