Remove deprecated and backwards compatibility code.

Prepare for RC baby!
@lorenzo Sounds good.