Remove unneeded event flushing and comments.