Remove depreciation and switch to cbv