Remove a lot, getting ready for redesign.