Remove depreciated methods