Revert "Took out expire-unused-keys, and createNewSession(); fixed test"

This reverts commit e84aeaa619821001443d9f70bee56ad8576a42c3.

*Tests are not passing*