Don't save uniqueId anymore