cleanup extra remove functionality from calendar
Merge branch 'gh-pages' into calendar