Can now add existing instances (in .data only)
Re-enabled file cleanup