Removing unused method, moving keys to the place where it's used
starting history work
Merge branch 'master' into dialogHistory
Initial history working