Removing old columns from Event (and adding files I forgot from last commit)