[Cleanup] Remove deprecated methods