diff --git a/AD1974-ADC.sch b/AD1974-ADC.sch
index f90109a..311dfab 100644
--- a/AD1974-ADC.sch
+++ b/AD1974-ADC.sch
@@ -15,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L adc-dac-rescue:AD1974-shimatta_adc U?
+L shimatta_adc:AD1974 U?
 U 1 1 5B68D566
 P 5100 5900
 F 0 "U?" H 5800 10687 60  0000 C CNN
diff --git a/adc-dac-cache.lib b/adc-dac-cache.lib
index 4f88633..35928ba 100644
--- a/adc-dac-cache.lib
+++ b/adc-dac-cache.lib
@@ -190,83 +190,6 @@ X VDDQ 9 100 1300 150 D 40 40 1 1 W
 ENDDRAW
 ENDDEF
 #
-# adc-dac-rescue:AD1974-shimatta_adc
-#
-DEF adc-dac-rescue:AD1974-shimatta_adc U 0 40 Y Y 1 F N
-F0 "U" 1300 4650 60 H V C CNN
-F1 "adc-dac-rescue:AD1974-shimatta_adc" 200 4650 60 H V C CNN
-F2 "" 450 3300 60 H V C CNN
-F3 "" 450 3300 60 H V C CNN
-DRAW
-T 900 950 3750 60 0 0 0 "Analog Input" Normal 0 C C
-T 900 400 600 60 0 0 0 "Analog Supply" Normal 0 C C
-T 900 500 2650 60 0 0 0 "Aux. Data" Normal 0 C C
-T 900 450 4150 60 0 0 0 Control Normal 0 C C
-T 900 450 3100 60 0 0 0 Data Normal 0 C C
-T 900 1050 600 60 0 0 0 "Digital Supply" Normal 0 C C
-T 900 350 1900 60 0 0 0 Filter Normal 0 C C
-T 900 550 3750 60 0 1 0 Clock Normal 0 C C
-S 0 0 1400 4600 0 1 0 f
-P 2 0 1 0 1400 3450 1350 3450 N
-P 3 0 1 0 0 1250 350 1250 350 0 N
-P 3 0 1 0 0 4000 400 4000 400 4600 N
-P 3 0 1 0 1000 4600 1000 3450 1350 3450 N
-P 3 0 1 0 1400 1250 1100 1250 1100 0 N
-P 4 0 1 0 0 2100 300 2100 300 1800 0 1800 N
-P 4 0 1 0 0 2850 450 2850 450 2450 0 2450 N
-P 4 0 1 0 0 3400 400 3400 400 3000 0 3000 N
-P 4 0 1 0 0 3900 500 3900 500 3650 0 3650 N
-X AGND 1 -200 650 200 R 50 50 1 1 W
-X PD/RST 10 -200 4500 200 R 50 50 1 1 I I
-X 11 11 1600 2850 200 L 50 50 1 1 N N
-X DGND 12 1600 350 200 L 50 50 1 1 W
-X DVDD 13 1600 900 200 L 50 50 1 1 W
-X AUXDATA2 14 -200 2500 200 R 50 50 1 1 B
-X AUXDATA1 15 -200 2600 200 R 50 50 1 1 B
-X 16 16 1600 2300 200 L 50 50 1 1 N N
-X AUXBCLK 17 -200 2700 200 R 50 50 1 1 B C
-X AUXLRCLK 18 -200 2800 200 R 50 50 1 1 B C
-X ASDATA2 19 -200 3050 200 R 50 50 1 1 B
-X MCLKI/XI 2 -200 3850 200 R 50 50 1 1 I C
-X ASDATA1 20 -200 3150 200 R 50 50 1 1 O
-X ABCLK 21 -200 3250 200 R 50 50 1 1 B C
-X ALRCLK 22 -200 3350 200 R 50 50 1 1 B C
-X CIN 23 -200 4350 200 R 50 50 1 1 I
-X COUT 24 -200 4250 200 R 50 50 1 1 B
-X DGND 25 1600 250 200 L 50 50 1 1 W
-X CCLK 26 -200 4150 200 R 50 50 1 1 I C
-X ~CLATCH 27 -200 4050 200 R 50 50 1 1 I
-X 28 28 1600 2700 200 L 50 50 1 1 N N
-X 29 29 1600 2600 200 L 50 50 1 1 N N
-X MCLKO/XO 3 -200 3700 200 R 50 50 1 1 O C
-X 30 30 1600 2500 200 L 50 50 1 1 N N
-X 31 31 1600 2400 200 L 50 50 1 1 N N
-X AGND 32 -200 450 200 R 50 50 1 1 W
-X AVDD 33 -200 1100 200 R 50 50 1 1 W
-X AGND 34 -200 350 200 R 50 50 1 1 W
-X FILTR 35 -200 1950 200 R 50 50 1 1 O
-X AGND 36 -200 250 200 R 50 50 1 1 W
-X AVDD 37 -200 1000 200 R 50 50 1 1 W
-X CM 38 -200 2050 200 R 50 50 1 1 w
-X ADC1LP 39 1600 4500 200 L 50 50 1 1 I
-X AGND 4 -200 550 200 R 50 50 1 1 W
-X ADC1LN 40 1600 4400 200 L 50 50 1 1 I
-X ADC1RP 41 1600 4200 200 L 50 50 1 1 I
-X ADC1RN 42 1600 4100 200 L 50 50 1 1 I
-X ADC2LP 43 1600 3900 200 L 50 50 1 1 I
-X ADC2LN 44 1600 3800 200 L 50 50 1 1 I
-X ADC2RP 45 1600 3600 200 L 50 50 1 1 I
-X ADC2RN 46 1600 3500 200 L 50 50 1 1 I
-X LF 47 -200 1850 200 R 50 50 1 1 I
-X AVDD 48 -200 900 200 R 50 50 1 1 I
-X AVDD 5 -200 1200 200 R 50 50 1 1 W
-X 6 6 1600 3250 200 L 50 50 1 1 N N
-X 7 7 1600 3150 200 L 50 50 1 1 N N
-X 8 8 1600 3050 200 L 50 50 1 1 N N
-X 9 9 1600 2950 200 L 50 50 1 1 N N
-ENDDRAW
-ENDDEF
-#
 # power:+1V2
 #
 DEF power:+1V2 #PWR 0 0 Y Y 1 F P
@@ -371,6 +294,83 @@ X GND 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
+# shimatta_adc:AD1974
+#
+DEF shimatta_adc:AD1974 U 0 40 Y Y 1 F N
+F0 "U" 1300 4650 60 H V C CNN
+F1 "shimatta_adc:AD1974" 200 4650 60 H V C CNN
+F2 "" 450 3300 60 H V C CNN
+F3 "" 450 3300 60 H V C CNN
+DRAW
+T 900 950 3750 60 0 0 0 "Analog Input" Normal 0 C C
+T 900 400 600 60 0 0 0 "Analog Supply" Normal 0 C C
+T 900 500 2650 60 0 0 0 "Aux. Data" Normal 0 C C
+T 900 450 4150 60 0 0 0 Control Normal 0 C C
+T 900 450 3100 60 0 0 0 Data Normal 0 C C
+T 900 1050 600 60 0 0 0 "Digital Supply" Normal 0 C C
+T 900 350 1900 60 0 0 0 Filter Normal 0 C C
+T 900 550 3750 60 0 1 0 Clock Normal 0 C C
+S 0 0 1400 4600 0 1 0 f
+P 2 0 1 0 1400 3450 1350 3450 N
+P 3 0 1 0 0 1250 350 1250 350 0 N
+P 3 0 1 0 0 4000 400 4000 400 4600 N
+P 3 0 1 0 1000 4600 1000 3450 1350 3450 N
+P 3 0 1 0 1400 1250 1100 1250 1100 0 N
+P 4 0 1 0 0 2100 300 2100 300 1800 0 1800 N
+P 4 0 1 0 0 2850 450 2850 450 2450 0 2450 N
+P 4 0 1 0 0 3400 400 3400 400 3000 0 3000 N
+P 4 0 1 0 0 3900 500 3900 500 3650 0 3650 N
+X AGND 1 -200 650 200 R 50 50 1 1 W
+X PD/RST 10 -200 4500 200 R 50 50 1 1 I I
+X 11 11 1600 2850 200 L 50 50 1 1 N N
+X DGND 12 1600 350 200 L 50 50 1 1 W
+X DVDD 13 1600 900 200 L 50 50 1 1 W
+X AUXDATA2 14 -200 2500 200 R 50 50 1 1 B
+X AUXDATA1 15 -200 2600 200 R 50 50 1 1 B
+X 16 16 1600 2300 200 L 50 50 1 1 N N
+X AUXBCLK 17 -200 2700 200 R 50 50 1 1 B C
+X AUXLRCLK 18 -200 2800 200 R 50 50 1 1 B C
+X ASDATA2 19 -200 3050 200 R 50 50 1 1 B
+X MCLKI/XI 2 -200 3850 200 R 50 50 1 1 I C
+X ASDATA1 20 -200 3150 200 R 50 50 1 1 O
+X ABCLK 21 -200 3250 200 R 50 50 1 1 B C
+X ALRCLK 22 -200 3350 200 R 50 50 1 1 B C
+X CIN 23 -200 4350 200 R 50 50 1 1 I
+X COUT 24 -200 4250 200 R 50 50 1 1 B
+X DGND 25 1600 250 200 L 50 50 1 1 W
+X CCLK 26 -200 4150 200 R 50 50 1 1 I C
+X ~CLATCH 27 -200 4050 200 R 50 50 1 1 I
+X 28 28 1600 2700 200 L 50 50 1 1 N N
+X 29 29 1600 2600 200 L 50 50 1 1 N N
+X MCLKO/XO 3 -200 3700 200 R 50 50 1 1 O C
+X 30 30 1600 2500 200 L 50 50 1 1 N N
+X 31 31 1600 2400 200 L 50 50 1 1 N N
+X AGND 32 -200 450 200 R 50 50 1 1 W
+X AVDD 33 -200 1100 200 R 50 50 1 1 W
+X AGND 34 -200 350 200 R 50 50 1 1 W
+X FILTR 35 -200 1950 200 R 50 50 1 1 O
+X AGND 36 -200 250 200 R 50 50 1 1 W
+X AVDD 37 -200 1000 200 R 50 50 1 1 W
+X CM 38 -200 2050 200 R 50 50 1 1 w
+X ADC1LP 39 1600 4500 200 L 50 50 1 1 I
+X AGND 4 -200 550 200 R 50 50 1 1 W
+X ADC1LN 40 1600 4400 200 L 50 50 1 1 I
+X ADC1RP 41 1600 4200 200 L 50 50 1 1 I
+X ADC1RN 42 1600 4100 200 L 50 50 1 1 I
+X ADC2LP 43 1600 3900 200 L 50 50 1 1 I
+X ADC2LN 44 1600 3800 200 L 50 50 1 1 I
+X ADC2RP 45 1600 3600 200 L 50 50 1 1 I
+X ADC2RN 46 1600 3500 200 L 50 50 1 1 I
+X LF 47 -200 1850 200 R 50 50 1 1 I
+X AVDD 48 -200 900 200 R 50 50 1 1 I
+X AVDD 5 -200 1200 200 R 50 50 1 1 W
+X 6 6 1600 3250 200 L 50 50 1 1 N N
+X 7 7 1600 3150 200 L 50 50 1 1 N N
+X 8 8 1600 3050 200 L 50 50 1 1 N N
+X 9 9 1600 2950 200 L 50 50 1 1 N N
+ENDDRAW
+ENDDEF
+#
 # shimatta_altera:EP4CE6E22C8N
 #
 DEF shimatta_altera:EP4CE6E22C8N U 0 40 Y Y 10 L N
diff --git a/adc-dac-rescue.dcm b/adc-dac-rescue.dcm
deleted file mode 100644
index 5f3ed79..0000000
--- a/adc-dac-rescue.dcm
+++ /dev/null
@@ -1,3 +0,0 @@
-EESchema-DOCLIB  Version 2.0
-#
-#End Doc Library
diff --git a/adc-dac-rescue.lib b/adc-dac-rescue.lib
deleted file mode 100644
index 1c2124b..0000000
--- a/adc-dac-rescue.lib
+++ /dev/null
@@ -1,81 +0,0 @@
-EESchema-LIBRARY Version 2.4
-#encoding utf-8
-#
-# AD1974-shimatta_adc
-#
-DEF AD1974-shimatta_adc U 0 40 Y Y 1 F N
-F0 "U" 1300 4650 60 H V C CNN
-F1 "AD1974-shimatta_adc" 200 4650 60 H V C CNN
-F2 "" 450 3300 60 H V C CNN
-F3 "" 450 3300 60 H V C CNN
-DRAW
-T 900 950 3750 60 0 0 0 "Analog Input" Normal 0 C C
-T 900 400 600 60 0 0 0 "Analog Supply" Normal 0 C C
-T 900 500 2650 60 0 0 0 "Aux. Data" Normal 0 C C
-T 900 450 4150 60 0 0 0 Control Normal 0 C C
-T 900 450 3100 60 0 0 0 Data Normal 0 C C
-T 900 1050 600 60 0 0 0 "Digital Supply" Normal 0 C C
-T 900 350 1900 60 0 0 0 Filter Normal 0 C C
-T 900 550 3750 60 0 1 0 Clock Normal 0 C C
-S 0 0 1400 4600 0 1 0 f
-P 2 0 1 0 1400 3450 1350 3450 N
-P 3 0 1 0 0 1250 350 1250 350 0 N
-P 3 0 1 0 0 4000 400 4000 400 4600 N
-P 3 0 1 0 1000 4600 1000 3450 1350 3450 N
-P 3 0 1 0 1400 1250 1100 1250 1100 0 N
-P 4 0 1 0 0 2100 300 2100 300 1800 0 1800 N
-P 4 0 1 0 0 2850 450 2850 450 2450 0 2450 N
-P 4 0 1 0 0 3400 400 3400 400 3000 0 3000 N
-P 4 0 1 0 0 3900 500 3900 500 3650 0 3650 N
-X AGND 1 -200 650 200 R 50 50 1 1 W
-X PD/RST 10 -200 4500 200 R 50 50 1 1 I I
-X 11 11 1600 2850 200 L 50 50 1 1 N N
-X DGND 12 1600 350 200 L 50 50 1 1 W
-X DVDD 13 1600 900 200 L 50 50 1 1 W
-X AUXDATA2 14 -200 2500 200 R 50 50 1 1 B
-X AUXDATA1 15 -200 2600 200 R 50 50 1 1 B
-X 16 16 1600 2300 200 L 50 50 1 1 N N
-X AUXBCLK 17 -200 2700 200 R 50 50 1 1 B C
-X AUXLRCLK 18 -200 2800 200 R 50 50 1 1 B C
-X ASDATA2 19 -200 3050 200 R 50 50 1 1 B
-X MCLKI/XI 2 -200 3850 200 R 50 50 1 1 I C
-X ASDATA1 20 -200 3150 200 R 50 50 1 1 O
-X ABCLK 21 -200 3250 200 R 50 50 1 1 B C
-X ALRCLK 22 -200 3350 200 R 50 50 1 1 B C
-X CIN 23 -200 4350 200 R 50 50 1 1 I
-X COUT 24 -200 4250 200 R 50 50 1 1 B
-X DGND 25 1600 250 200 L 50 50 1 1 W
-X CCLK 26 -200 4150 200 R 50 50 1 1 I C
-X ~CLATCH 27 -200 4050 200 R 50 50 1 1 I
-X 28 28 1600 2700 200 L 50 50 1 1 N N
-X 29 29 1600 2600 200 L 50 50 1 1 N N
-X MCLKO/XO 3 -200 3700 200 R 50 50 1 1 O C
-X 30 30 1600 2500 200 L 50 50 1 1 N N
-X 31 31 1600 2400 200 L 50 50 1 1 N N
-X AGND 32 -200 450 200 R 50 50 1 1 W
-X AVDD 33 -200 1100 200 R 50 50 1 1 W
-X AGND 34 -200 350 200 R 50 50 1 1 W
-X FILTR 35 -200 1950 200 R 50 50 1 1 O
-X AGND 36 -200 250 200 R 50 50 1 1 W
-X AVDD 37 -200 1000 200 R 50 50 1 1 W
-X CM 38 -200 2050 200 R 50 50 1 1 w
-X ADC1LP 39 1600 4500 200 L 50 50 1 1 I
-X AGND 4 -200 550 200 R 50 50 1 1 W
-X ADC1LN 40 1600 4400 200 L 50 50 1 1 I
-X ADC1RP 41 1600 4200 200 L 50 50 1 1 I
-X ADC1RN 42 1600 4100 200 L 50 50 1 1 I
-X ADC2LP 43 1600 3900 200 L 50 50 1 1 I
-X ADC2LN 44 1600 3800 200 L 50 50 1 1 I
-X ADC2RP 45 1600 3600 200 L 50 50 1 1 I
-X ADC2RN 46 1600 3500 200 L 50 50 1 1 I
-X LF 47 -200 1850 200 R 50 50 1 1 I
-X AVDD 48 -200 900 200 R 50 50 1 1 I
-X AVDD 5 -200 1200 200 R 50 50 1 1 W
-X 6 6 1600 3250 200 L 50 50 1 1 N N
-X 7 7 1600 3150 200 L 50 50 1 1 N N
-X 8 8 1600 3050 200 L 50 50 1 1 N N
-X 9 9 1600 2950 200 L 50 50 1 1 N N
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/sym-lib-table b/sym-lib-table
index 36e9167..f44fc6d 100644
--- a/sym-lib-table
+++ b/sym-lib-table
@@ -2,5 +2,4 @@
   (lib (name shimatta_analog)(type Legacy)(uri ${SHIMATTA_DIR}/schematics/shimatta_analog.lib)(options "")(descr ""))
   (lib (name shimatta_adc)(type Legacy)(uri ${SHIMATTA_DIR}/schematics/shimatta_adc.lib)(options "")(descr ""))
   (lib (name shimatta_altera)(type Legacy)(uri ${SHIMATTA_DIR}/schematics/shimatta_altera.lib)(options "")(descr ""))
-  (lib (name adc-dac-rescue)(type Legacy)(uri ${KIPRJMOD}/adc-dac-rescue.lib)(options "")(descr ""))
 )