Extract events class
Move Events to separated class
Remove event saving methods