Simplified deleteSource & implemented util::toId (get id from entity)