Setup for smarter event adding + cleaning