Merge pull request #56 from akkie/master

Remove redundant Json.toJson call and unneeded imports
Remove old event implementation in favor of #59