Delete deprecated implementation