clean default value and add missing source