Cleanup: remove unneeded INVALID event