Add simple ADC and cleanup