diff --git a/bootstrap b/bootstrap
index d2d3d88d..278d0fd9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -16,32 +16,6 @@
 # Die if an error occurs
 set -e
 
-# LolEngine specific:
-sed -ne '/AC_CONFIG_FILES/,$p' configure.ac \
-  | sed -ne 's@[^a-z]*\(.*/.*\)[^a-z]*@\1@p' | while read p; do
-    case "$p" in
-        "")
-            continue
-            ;;
-        *Makefile)
-            required="${p}.am"
-            ;;
-        *)
-            required="${p}.in"
-            ;;
-    esac
-    if [ ! -f "${required}" ]; then
-        echo "bootstrap: ${required} does not exist -- creating stub"
-        case "$p" in
-            */*)
-                mkdir -p "${p%/*}"
-                ;;
-        esac
-        echo '# Stub created by bootstrap' > "${required}"
-        echo 'include $(top_srcdir)/build/autotools/common.am' >> "${required}"
-    fi
-done
-
 # Guess whether we are using configure.ac or configure.in
 if test -f configure.ac; then
   conffile="configure.ac"
diff --git a/configure.ac b/configure.ac
index 9044c558..891738fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,7 @@ AC_CHECK_HEADERS(cxxabi.h)
 AC_LANG_POP(C++)
 
 dnl  Common C functions
-AC_CHECK_FUNCS(getenv system tmpfile tmpnam getcwd _getcwd getlogin)
+AC_CHECK_FUNCS(getenv system tmpfile tmpnam getcwd _getcwd)
 AC_CHECK_FUNCS(backtrace_symbols)
 AC_CHECK_FUNCS(gettimeofday usleep)
 
@@ -241,10 +241,6 @@ AM_CONDITIONAL(BUILD_TUTORIAL, test "${enable_tutorial}" != "no" -a "${enable_su
 AM_CONDITIONAL(BUILD_SAMPLES, test "${enable_samples}" != "no" -a "${enable_subproject}" != "yes")
 
 
-dnl Should we ship non-free data?
-AM_CONDITIONAL(HAVE_NONFREE, true)
-
-
 LOL_AC_FINI()
 
 AC_CONFIG_HEADER(config.h)