Remove BC for deprecated code

Change-Id: If2834874412fd5df5dbacc23c412b794c5e00e64
Merge "Remove BC for deprecated code"