merged calendar and activity (they are essentially two views of the same thing), removed calendar artifacts