Cleaned unused files and created lastMatch and calendar views