Bug 724632 - Remove of legacy APIs

This is work in progress bucket, I'm going to clean it up and split into individual pull requests once it's finished