Revert "Event properties now class variables"

This reverts commit 0aa9e40a3abf61a99e48e4140ac1708ee02634c2.