Make our cleanup strategy more robust
Rename generic file edit to update