Revert "Added key to calendar.  Added estimate refreshing.  Fixed bugs"

This reverts commit 479326b973cbe2bf5282e6fa3ebd5c2b96b27af5.