Fix quadlet companion file handling and dedup in removal paths