Another inner class bites the dust (swtich removal)