Properly depracate the old code

Retain B/C