put back in event testing, remove unused events