[PATCH] Process Events - Header Cleanup