Remove cruft; make panels work a bit better.