Calendar Group - Cleaning up and merging obsolete files