Remove depreciation warnings