Reverted

Reverted all pipe drawings except formulas in the pipe class; I'm
restarting.