Clean up/speed up inserting new event