More cleanup in bootstrap.php.