Intial cleanup
Removing events
Adding gemfile for merge