Better calendar store
Remove unused source
Rename class
sleep