changes according to last workshop
removed unused information
removed unused files
removed unused files