Remove this whole section? @andrewgaul: thoughts?