Removed BC break and re-initialized key service