Deleting files
Various fixes