Fix of deletes and imports