Remove deprecated and backwards compatibility code.

Prepare for RC baby!
No worries I spent some time on removing the deprecated code last night as well, but got too tire before I finished. However, I did get these tests working, so we can still use that part of it.