[TW215] - Drop more unneeded code.