diff --git a/scripts/internal/manylinux-build-common.sh b/scripts/internal/manylinux-build-common.sh
index 0236189..7e1886b 100644
--- a/scripts/internal/manylinux-build-common.sh
+++ b/scripts/internal/manylinux-build-common.sh
@@ -7,7 +7,13 @@ set -e -x
 # For example,
 # manylinux-build-wheels.sh cp27mu cp35
 if [[ $# -eq 0 ]]; then
-  PYBINARIES=(/opt/python/*/bin)
+  PYBIN=(/opt/python/*/bin)
+  PYBINARIES=()
+  for version in "${PYBIN[@]}"; do
+    if [[ ${version} == *"cp27"* || ${version} == *"cp35"* || ${version} == *"cp36"* ]]; then
+      PYBINARIES+=(${version})
+    fi
+  done
 else
   PYBINARIES=()
   for version in "$@"; do
diff --git a/scripts/internal/manylinux-build-wheels.sh b/scripts/internal/manylinux-build-wheels.sh
index 7986134..62effab 100755
--- a/scripts/internal/manylinux-build-wheels.sh
+++ b/scripts/internal/manylinux-build-wheels.sh
@@ -23,12 +23,7 @@ popd > /dev/null 2>&1
 
 # Compile wheels re-using standalone project and archive cache
 for PYBIN in "${PYBINARIES[@]}"; do
-    if [[ ${PYBIN} == *"cp26"* || ${PYBIN} == *"cp33"* ]]; then
-        echo "Skipping ${PYBIN}"
-        continue
-    fi
-
-    PYTHON_EXECUTABLE=${PYBIN}/python
+    export PYTHON_EXECUTABLE=${PYBIN}/python
     PYTHON_INCLUDE_DIR=$( find -L ${PYBIN}/../include/ -name Python.h -exec dirname {} \; )
 
     echo ""
@@ -61,6 +56,8 @@ for PYBIN in "${PYBINARIES[@]}"; do
     # Cleanup
     ${PYBIN}/python setup.py clean
 
+    # Remove unnecessary files for building against VTK
+    find ${build_path} -name '*.o' -delete
 done
 
 # Fixup the wheels (update from 'linux' to 'manylinux1' tag)
@@ -72,10 +69,6 @@ done
 
 # Install packages and test
 for PYBIN in "${PYBINARIES[@]}"; do
-    if [[ ${PYBIN} == *"cp26"* || ${PYBIN} == *"cp33"* ]]; then
-        echo "Skipping ${PYBIN}"
-        continue
-    fi
     #${PYBIN}/pip install numpy
     ${PYBIN}/pip install vtk --no-cache-dir --no-index -f /work/dist
     #(cd $HOME && ${PYBIN}/python -c 'from itk import ITKCommon;')