Removed empty class from last merge

AddEvents class had no information in it and was causing errors, so have
removed it and merged branches.