removed obsolete files, cleaned up views, and merged calendar views.