Remove unused code
Merge branch 'Toastman-RT' into Toastman-RT-N