Nor does any of this fullscreen/buttonbar stuff appear to be used. Let me tidy this up...