Remove some theme chooser leftovers