Bug fixes. Group and file deletion