Add switch reading.
Clean up unused items.