diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c83d443afae7db6249e963a198d221f54cee91b0..3c64ff2460ee42b08152343485def71181e70cf4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,3 @@
-"Python 2.7 AMD CPU":
-  script:
-  - export PY_EXE=python2.7
-  - export PYOPENCL_TEST=amd:pu
-  - export EXTRA_INSTALL="pybind11 numpy mako"
-  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
-  - ". ./build-and-test-py-project.sh"
-  allow_failure: true
-  tags:
-  - python2.7
-  - amd-cl-cpu
-  - opengl
-  except:
-  - tags
-  artifacts:
-    reports:
-      junit: test/pytest.xml
-
 Python 3 Intel CPU:
   script:
   - export PY_EXE=python3
@@ -82,6 +64,7 @@ Python 3 K40:
       junit: test/pytest.xml
 
 Python 3 AMD GPU:
+  allow_failure: true
   script:
   - export PY_EXE=python3
   - export PYOPENCL_TEST=amd:gfx803
@@ -220,9 +203,10 @@ PyPy POCL:
   - export PY_EXE=pypy
   - export PYOPENCL_TEST=portable
 
-  - rm -f pyproject.toml  # to avoid installing vanilla numpy
-  # https://github.com/pybind/pybind11/pull/1494
-  - export EXTRA_INSTALL="git+https://github.com/inducer/pybind11 numpy mako"
+  # On pypy, this seems to install old versions from the package index
+  # independently of whether newer ones are already present.
+  - rm -f pyproject.toml 
+  - export EXTRA_INSTALL="pybind11 numpy mako"
 
   - export NO_DOCTESTS=1
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
diff --git a/doc/runtime_program.rst b/doc/runtime_program.rst
index 71ee84b4841c457daba248a1be87d2967fa21a08..174b25d1cd9fee29562c9df31826981a5b1bbde8 100644
--- a/doc/runtime_program.rst
+++ b/doc/runtime_program.rst
@@ -286,8 +286,3 @@ Kernel
 
     .. versionchanged:: 2011.1
         Added the *g_times_l* keyword arg.
-
-
-.. function:: enqueue_task(queue, kernel, wait_for=None)
-
-    |std-enqueue-blurb|
diff --git a/src/wrap_cl.cpp b/src/wrap_cl.cpp
index b9393ed0f4963968d7006d686e72c349eebc20ad..50a482016ebda749ec4031f9d7cb92ab200dfa12 100644
--- a/src/wrap_cl.cpp
+++ b/src/wrap_cl.cpp
@@ -43,11 +43,7 @@ extern void pyopencl_expose_mempool(py::module &m);
 
 static bool import_numpy_helper()
 {
-#ifdef PYPY_VERSION
-      import_array();
-#else
-      import_array1(false);
-#endif
+  import_array1(false);
   return true;
 }