pull in new changes from master to yCanta 2

want this especially for the removed unused files