Start removing BC references.
This is based on BC 6.0.x