diff --git a/applications/welcome/views/default/about.html b/applications/welcome/views/default/about.html
deleted file mode 100644
index beccf884..00000000
--- a/applications/welcome/views/default/about.html
+++ /dev/null
@@ -1,109 +0,0 @@
-{{extend 'layout_b.html'}}
-
-<div class="page-header">
-    <h1>Some navigation examples</h1>
-</div>
-<p class="lead">By using <code>bs3.menu()</code> we can build several navigation types: <code>navbars</code>, <code>tabbed navigations</code> and <code>pills navigations</code>.</p>
-
-<div class="container">
-    <div class="row">
-        <div id="myTab" class="col-md-10 col-md-offset-1">
-            <h2><span class="muted-text">Navbar</span></h2>
-            <br>
-            <nav class="navbar navbar-default" role="navigation">
-              <!-- Brand and toggle get grouped for better mobile display -->
-              <div class="navbar-header">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-                  <span class="sr-only">Toggle navigation</span>
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                </button>
-                <a class="navbar-brand" href="#">Brand</a>
-              </div>
-              <!-- Collect the nav links, forms, and other content for toggling -->
-              <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-                {{
-                 nav1 = [LI(A('Link', _href='#'), _class='active'),
-                         LI(A('Link', _href='#')),
-                        ('', False, A('Dropdown', _href='#'),[
-                            LI(A('Action', _href="#")),
-                            LI(A('Another action', _href="#")),
-                            LI(A('Something else here', _href="#")),
-                            LI(_class="divider"),
-                            LI(A('Separated link', _href="#")),
-                            LI(_class="divider"),
-                            LI(A('One more separated link', _href="#"))
-                            ])
-                        ]
-                 nav2 = [LI(A('Link', _href='#')),
-                        ('', False, A('Dropdown', _href='#'),[
-                            LI(A('Action', _href="#")),
-                            LI(A('Another action', _href="#")),
-                            LI(A('Something else here', _href="#")),
-                            LI(_class="divider"),
-                            LI(A('Separated link', _href="#"))
-                            ])
-                        ]
-                =bs3.menu(menu_list=nav1)}}
-                <form class="navbar-form navbar-left" role="search">
-                  <div class="form-group">
-                    <input type="text" class="form-control" placeholder="Search">
-                  </div>
-                  <button type="submit" class="btn btn-default">Submit</button>
-                </form>
-                {{=bs3.menu(add_classes='pull-right',menu_list=nav2)}}
-              </div><!-- /.navbar-collapse -->
-            </nav>
-        </div>
-    </div>
-    <br>
-    <div class="row">
-          <div id="myTab" class="col-md-10 col-md-offset-1">
-          <h2><span class="muted-text">Tabs</span></h2>
-          <br>
-          {{=bs3.menu('tabs','nav-justified',test_tabs)}}
-          <div id="myTabContent" class="tab-content">
-            <div class="tab-pane fade" id="home">
-              <p>Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.</p>
-            </div>
-            <div class="tab-pane fade" id="profile">
-              <p>Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.</p>
-            </div>
-            <div class="tab-pane fade" id="dropdown1">
-              <p>Etsy mixtape wayfarers, ethical wes anderson tofu before they sold out mcsweeney's organic lomo retro fanny pack lo-fi farm-to-table readymade. Messenger bag gentrify pitchfork tattooed craft beer, iphone skateboard locavore carles etsy salvia banksy hoodie helvetica. DIY synth PBR banksy irony. Leggings gentrify squid 8-bit cred pitchfork. Williamsburg banh mi whatever gluten-free, carles pitchfork biodiesel fixie etsy retro mlkshk vice blog. Scenester cred you probably haven't heard of them, vinyl craft beer blog stumptown. Pitchfork sustainable tofu synth chambray yr.</p>
-            </div>
-            <div class="tab-pane fade active in" id="dropdown2">
-              <p>Trust fund seitan letterpress, keytar raw denim keffiyeh etsy art party before they sold out master cleanse gluten-free squid scenester freegan cosby sweater. Fanny pack portland seitan DIY, art party locavore wolf cliche high life echo park Austin. Cred vinyl keffiyeh DIY salvia PBR, banh mi before they sold out farm-to-table VHS viral locavore cosby sweater. Lomo wolf viral, mustache readymade thundercats keffiyeh craft beer marfa ethical. Wolf salvia freegan, sartorial keffiyeh echo park vegan.</p>
-            </div>
-          </div>
-        </div>
-    </div>
-    <br>
-    <div class="row">
-        <div class="col-md-10 col-md-offset-1">
-          <h2><span class="muted-text">Pills</span></h2>
-          <br>
-          {{
-             nav3 = [LI(A('Home', _href='#'), _class='active'),
-                     LI(A('Help', _href='#')),
-                    ('', False, A('Dropdown', _href='#'),[
-                        LI(A('Action', _href="#")),
-                        LI(A('Another action', _href="#")),
-                        LI(A('Something else here', _href="#")),
-                        LI(_class="divider"),
-                        LI(A('Separated link', _href="#"))
-                        ])
-                    ]
-          }}
-           <div class="row">
-                <div class="col-md-6">
-                {{=bs3.menu('pills',menu_list=nav3)}}
-                </div>
-                <div class="col-md-6">
-                {{=bs3.menu('pills','pull-right nav-stacked', nav3)}}
-                </div>
-          </div>
-        </div>
-    </div>
-</div>
diff --git a/applications/welcome/views/default/display_form.html b/applications/welcome/views/default/display_form.html
deleted file mode 100644
index 9267332d..00000000
--- a/applications/welcome/views/default/display_form.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{{extend 'layout.html'}}
-
-<h2>{{=T(request.function.replace('_',' ').capitalize())}}</h2>
-<p class="lead">&nbsp;</p>
-
-<div class="container">
-    <div class="row">
-        <div class="col-md-6">
-            {{=form}}
-        </div>
-    </div>
-</div>
-
-{{block page_js}}
-<script>
-    jQuery("#web2py_user_form input:visible:enabled:first").focus();
-</script>
-{{end page_js}}
diff --git a/applications/welcome/views/default/help.html b/applications/welcome/views/default/help.html
deleted file mode 100644
index 048c9983..00000000
--- a/applications/welcome/views/default/help.html
+++ /dev/null
@@ -1 +0,0 @@
-{{extend 'layout_c.html'}}
diff --git a/applications/welcome/views/default/list_records.html b/applications/welcome/views/default/list_records.html
deleted file mode 100644
index cb3ecd95..00000000
--- a/applications/welcome/views/default/list_records.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{{bs3_table = SQLTABLE(records, _class='table table-striped table-bordered table-hover table-condensed')}}
-{{extend 'layout.html'}}
-
-<div class="table-responsive">
-{{=bs3_table}}
-</div>
diff --git a/applications/welcome/views/layout_b.html b/applications/welcome/views/layout_b.html
deleted file mode 100644
index 9fe413ba..00000000
--- a/applications/welcome/views/layout_b.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{=T.accepted_language or 'en'}}">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <!-- Favicons -->
-    <link rel="shortcut icon" href="{{=URL('static','images/favicon.ico')}}" type="image/x-icon">
-    <link rel="apple-touch-icon" href="{{=URL('static','images/favicon.png')}}">
-
-    <title>{{=response.title or request.application}}</title>
-
-
-    {{
-       response.files.insert(0,URL('static','css/web2py.css'))
-       response.files.insert(1,URL('static','css/bootstrap.min.css'))
-       response.files.insert(2,URL('static','css/web2py-bootstrap3-b.css'))
-    }}
-
-    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-      <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
-    <![endif]-->
-
-    {{include 'web2py_ajax.html'}}
-    {{block head}}{{end}}
-  </head>
-
-  <body>
-
-    <!-- Wrap all page content here -->
-    <div id="wrap">
-
-      <!-- Fixed navbar -->
-      <div class="navbar navbar-default navbar-fixed-top" role="navigation">
-        <div class="container">
-          <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-              <span class="sr-only">Toggle navigation</span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-            </button>
-            {{=response.logo or ''}}
-          </div>
-          <div class="collapse navbar-collapse">
-            <ul class="nav navbar-nav navbar-right">
-                {{='auth' in globals() and bs3.navbar() or ''}}
-            </ul>
-            {{if response.menu:}}
-            {{=bs3.menu()}}
-            {{pass}}
-          </div><!--/.nav-collapse -->
-        </div>
-      </div>
-
-      <!-- Begin page content -->
-      <div class="container">
-
-        {{include}}
-
-      </div>
-    </div>
-    <div id="footer">
-      <div class="container">
-                    <p class="text-muted pull-right">{{=T('Powered by')}} <a href="http://www.web2py.com/">web2py</a></p>
-
-                    <p class="text-muted">{{=T('Copyright')}} &#169; {{=request.now.year}}</p>
-      </div>
-    </div>
-
-
-<!-- The javascript =========================================================== -->
-        <script src="{{=URL('static','js/bootstrap.min.js')}}"></script>
-        <script src="{{=URL('static','js/web2py-bootstrap3.js')}}"></script>
-        {{block page_js}}{{end page_js}}
-        {{if response.google_analytics_id:}}
-<!-- Analytics ================================================================ -->
-        <script src="{{=URL('static','js/analytics.min.js')}}"></script>
-        <script type="text/javascript">
-            analytics.initialize({
-            'Google Analytics':{trackingId:'{{=response.google_analytics_id}}'}
-            });
-        </script>
-        {{pass}}
-<!-- Share ==================================================================== -->
-        <script src="{{=URL('static','js/share.js',vars=dict(static=URL('static','images')))}}"></script>
-  </body>
-</html>
diff --git a/applications/welcome/views/layout_c.html b/applications/welcome/views/layout_c.html
deleted file mode 100644
index 3e8e677a..00000000
--- a/applications/welcome/views/layout_c.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{=T.accepted_language or 'en'}}">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <!-- Favicons -->
-    <link rel="shortcut icon" href="{{=URL('static','images/favicon.ico')}}" type="image/x-icon">
-    <link rel="apple-touch-icon" href="{{=URL('static','images/favicon.png')}}">
-
-    <title>{{=response.title or request.application}}</title>
-
-    
-    {{
-       response.files.insert(0,URL('static','css/web2py.css'))
-       response.files.insert(1,URL('static','css/bootstrap.min.css'))
-       response.files.insert(2,URL('static','css/web2py-bootstrap3-c.css'))
-    }}
-
-    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-      <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
-    <![endif]-->
-    
-    {{include 'web2py_ajax.html'}}
-    <style>
-    .jumbotron h1 {font-size: 58px;}
-    </style>
-    {{block head}}{{end}}
-    {{response.subtitle="Cras justo odio, dapibus ac facilisis in, egestas \
-                         eget quam. Fusce dapibus, tellus ac cursus commodo, \
-                         tortor mauris condimentum nibh, ut fermentum massa \
-                         justo sit amet risus."}}
-  </head>
-
-  <body>
-
-    <div class="container">
-      <div class="header">
-        {{if response.menu:}}
-            {{=bs3.menu('pills','pull-right')}}
-        {{pass}}
-        {{='auth' in globals() and bs3.navbar() or ''}}
-        <h3><a data-w2p_disable_with="default" href="http://www.web2py.com/" id="web2py-logo"><b>web<span>2</span>py</b>™&nbsp;</a></h3>
-      </div>
-
-      <div class="jumbotron">
-        {{if response.title:}}
-        <h1>{{=response.title}}</h1>
-        <p class="lead">{{=response.subtitle or ''}}</p>
-        {{pass}}
-
-        <p><button id="w2padmin-btn" class="btn btn-lg btn-success ">
-            <i class="glyphicon glyphicon-cog"></i> {{=T("Administrative Interface")}}
-        </button></p>
-      </div>
-
-      <div class="row marketing">
-        <div class="col-lg-6">
-          <h4>{{=T('You are successfully running web2py')}}</h4>
-          <p>{{=T('You can modify this application and adapt it to your needs')}}</p>
-
-          <h4>Subheading</h4>
-          <p>Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.</p>
-
-          <h4>Subheading</h4>
-          <p>Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
-        </div>
-
-        <div class="col-lg-6">
-          <h4>{{=T("Don't know what to do?")}}</h4>
-          <p>{{=A(T("Online examples"), _href=URL('examples','default','index'))}}<br>
-          <a href="http://web2py.com">web2py.com</a><br>
-          <a href="http://web2py.com/book">{{=T('Documentation')}}</a></p>
-
-          <h4>Subheading</h4>
-          <p>Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.</p>
-
-          <h4>Subheading</h4>
-          <p>Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
-        </div>
-      </div>
-
-      <div class="a_footer">
-        <p class="pull-right">{{=T('Powered by')}} <a href="http://www.web2py.com/">web2py</a></p>
-        <p>{{=T('Copyright')}} &#169; {{=request.now.year}}</p>
-      </div>
-
-    </div> <!-- /container -->
-
-
-<!-- The javascript =========================================================== -->
-        <script src="{{=URL('static','js/bootstrap.min.js')}}"></script>
-        <script src="{{=URL('static','js/web2py-bootstrap3.js')}}"></script>
-        <script>
-            $(document).ready(function() {
-                $(".web2py-menu-first").addClass('active');
-                $("#w2p-auth-bar").parent().appendTo('.nav-pills');
-                $('#w2padmin-btn').click(function() {
-                    window.location = "{{=URL('admin','default','index')}}";
-                });
-            });
-        </script>
-        {{block page_js}}{{end page_js}}
-        {{if response.google_analytics_id:}}
-<!-- Analytics ================================================================ -->
-        <script src="{{=URL('static','js/analytics.min.js')}}"></script>
-        <script type="text/javascript">
-            analytics.initialize({
-            'Google Analytics':{trackingId:'{{=response.google_analytics_id}}'}
-            });
-        </script>
-        {{pass}}
-<!-- Share ==================================================================== -->
-        <script src="{{=URL('static','js/share.js',vars=dict(static=URL('static','images')))}}"></script>
-  </body>
-</html>
diff --git a/applications/welcome/web2py.app.welcome3.w2p b/applications/welcome/web2py.app.welcome3.w2p
deleted file mode 100644
index 738387e5..00000000
Binary files a/applications/welcome/web2py.app.welcome3.w2p and /dev/null differ