diff --git a/samples/XPages/UnpMain.xsp b/samples/XPages/UnpMain.xsp
deleted file mode 100644
index e0eb6438..00000000
--- a/samples/XPages/UnpMain.xsp
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xp:view xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
-	xmlns:unp="http://unplugged.openntf.org">
-	<xc:commonheader></xc:commonheader>
-	<div id="main" class="container bootcards-container">
-		<div class="row">
-
-			<xp:div styleClass="bootcards-cards fullheightrow">
-				<div class="col-xs-12 col-sm-12 col-md-6">
-					<xc:UnpBootWorkspace title="Workspace"
-						linkurlcol="UnpUrl" labelcol="Title" iconcol="ImgUrl"
-						footertext="Built with Bootcards - Summary Card" badgecol="BadgeID"
-						columndefinition="col-xs-6 col-md-6">
-						<xc:this.workspaceview><![CDATA[#{javascript:"HomeLinks Home"}]]></xc:this.workspaceview>
-					</xc:UnpBootWorkspace>
-				</div>
-				<div class="col-xs-12 col-sm-12 col-md-6">
-					<div class="panel panel-default bootcards-chart">
-						<div class="panel-heading">
-							<h3 class="panel-title">
-								Closed sales by team member - $000s
-								(December)
-							</h3>
-						</div>
-						<div class="">
-							<div id="div2" class="chartpanelelement">
-								<div id="pie1"></div>
-							</div>
-							<div class="panel-footer">
-								<a href="" class="btn btn-default btn-block" onclick="toggleChartData(); return false;">
-									<i class="fa fa-table"></i>
-									&#160;Show Data
-								</a>
-							</div>
-						</div>
-						<div class="panel-footer">
-							<small class="pull-left">
-								Built with Bootcards - Chart Card
-							</small>
-						</div>
-					</div>
-					<div class="panel panel-default bootcards-table" style="display: none;">
-						<div class="panel-heading">
-							<h3 class="panel-title">
-								Closed sales by team member - $000s
-								(December)
-							</h3>
-						</div>
-						<table class="table table-hover">
-							<thead>
-								<tr class="active">
-									<th>Name</th>
-									<th class="text-right">
-										Sales Value
-									</th>
-								</tr>
-							</thead>
-							<tbody></tbody>
-						</table>
-						<div class="panel-footer">
-							<a href="" class="btn btn-default btn-block" onclick="toggleChartData(); return false;">
-								<i class="fa fa-bar-chart-o"></i>
-								&#160;Show Chart
-							</a>
-						</div>
-						<div class="panel-footer">
-							<div class="panel-footer">
-								<small class="pull-left">
-									Built with Bootcards - Chart Card
-								</small>
-							</div>
-						</div>
-					</div>
-				</div>
-			</xp:div>
-		</div>
-	</div>
-
-	<script src="unp/raphael.min.js" type="text/javascript"></script>
-	<script src="unp/morris.min.js" type="text/javascript"></script>
-
-	<xc:commonfooter></xc:commonfooter>
-</xp:view>
\ No newline at end of file
diff --git a/samples/XPages/demoServerRESTconsumption.xsp b/samples/XPages/demoServerRESTconsumption.xsp
deleted file mode 100644
index 3334c777..00000000
--- a/samples/XPages/demoServerRESTconsumption.xsp
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xp:view
-	xmlns:xp="http://www.ibm.com/xsp/core">
-	<xp:this.beforePageLoad><![CDATA[#{javascript://import Java package
-importPackage(co.3edesign.eric.restful);
- 
-var urlStr = "http://ajax.googleapis.com/ajax/services/feed/load?v=1.0&num=5&q=";
-urlStr += "http://www.npr.org/rss/rss.php?id=1001";
-var myStuff:JsonObject = CustRestConsumer.GetMyRestData(urlStr);
- 
-viewScope.myResp = fromJson(myStuff);}]]></xp:this.beforePageLoad>
-	<xp:dataTable
-		id="dataTable1"
-		rows="30"
-		var="rowData"
-		indexVar="rowCount">
-		<xp:this.value><![CDATA[#{javascript:var obj = viewScope.get("myResp");
-return obj.responseData.feed.entries;}]]></xp:this.value>
-		<xp:column
-			id="column1">
-			<xp:this.facets>
-				<xp:panel
-					xp:key="header"
-					tagName="h1">
-					<xp:link
-						escape="true"
-						id="link1">
-						<xp:this.text><![CDATA[#{javascript:var obj = viewScope.get("myResp");
-	return obj.title;}]]></xp:this.text>
-						<xp:this.value><![CDATA[#{javascript:var obj = viewScope.get("myResp");
-	return obj.link;}]]></xp:this.value>
-					</xp:link>
-				</xp:panel>
-			</xp:this.facets>
-		</xp:column>
-		<xp:column
-			id="column2">
-			<xp:panel
-				tagName="h3">
-				<xp:link
-					escape="true"
-					id="link2"
-					text="#{javascript:rowData.title}"
-					value="#{javascript:rowData.link}">
-				</xp:link>
-			</xp:panel>
-			<xp:br></xp:br>
-			<xp:text
-				escape="false"
-				id="computedField2"
-				value="#{javascript:rowData.content}">
-			</xp:text>
-			<xp:br></xp:br>
-		</xp:column>
-		<xp:column
-			id="column3">
-			<xp:text
-				escape="true"
-				id="computedField3"
-				value="#{javascript:rowData.publishedDate}">
-			</xp:text>
-		</xp:column>
-	</xp:dataTable>
-</xp:view>
\ No newline at end of file
diff --git a/samples/XPages/house.form b/samples/XPages/house.form
deleted file mode 100644
index 7c47b41c..00000000
--- a/samples/XPages/house.form
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<form name='house' xmlns='http://www.lotus.com/dxl' version='9.0' maintenanceversion='1.0'
- replicaid='88257E000001FF59' publicaccess='false' designerversion='8.5.3'
- renderpassthrough='true'>
-<noteinfo noteid='1a6' unid='48A425C44E1B808586257DB90078880D' sequence='5'>
-<created><datetime>20141225T155631,49-06</datetime></created>
-<modified><datetime>20150306T091952,06-08</datetime></modified>
-<revised><datetime>20150306T091952,05-08</datetime></revised>
-<lastaccessed><datetime>20150306T091952,06-08</datetime></lastaccessed>
-<addedtofile><datetime>20150305T162153,26-08</datetime></addedtofile></noteinfo>
-<updatedby><name>CN=Eric McCormick/O=Eric McCormick</name></updatedby>
-<wassignedby><name>CN=Eric McCormick/O=Eric McCormick</name></wassignedby>
-<body><richtext>
-<pardef id='1'/>
-<par def='1'><field type='text' kind='editable' name='name'/><compositedata
- type='98' prevtype='65418' nexttype='222' afterparcount='6' containertype='65418'
- aftercontainercount='1' afterbegincount='3'>
-Yg4BAIQAAAAAAAAAAAA=
-</compositedata></par>
-<par def='1'><field type='text' kind='editable' name='description'/><compositedata
- type='98' prevtype='65418' nexttype='222' afterparcount='5' containertype='65418'
- aftercontainercount='1' afterbegincount='3'>
-Yg4BAIQAAAAAAAAAAAA=
-</compositedata></par>
-<par def='1'><field type='text' kind='editable' name='coatOfArms'/><compositedata
- type='98' prevtype='65418' nexttype='222' afterparcount='5' containertype='65418'
- aftercontainercount='1' afterbegincount='3'>
-Yg4BAIQAAAAAAAAAAAA=
-</compositedata></par>
-<par def='1'><field type='text' kind='editable' name='words'/><compositedata
- type='98' prevtype='65418' nexttype='222' afterparcount='5' containertype='65418'
- aftercontainercount='1' afterbegincount='3'>
-Yg4BAIQAAAAAAAAAAAA=
-</compositedata></par>
-<par def='1'><field type='text' kind='editable' name='seat'/><compositedata
- type='98' prevtype='65418' nexttype='222' afterparcount='5' containertype='65418'
- aftercontainercount='1' afterbegincount='3'>
-Yg4BAIQAAAAAAAAAAAA=
-</compositedata></par>
-<par def='1'><field type='text' kind='editable' name='currentLord'/><compositedata
- type='98' prevtype='65418' nexttype='222' afterparcount='5' containertype='65418'
- aftercontainercount='1' afterbegincount='3'>
-Yg4BAIQAAAAAAAAAAAA=
-</compositedata></par>
-<par def='1'><field type='text' kind='editable' name='region'/><compositedata
- type='98' prevtype='65418' nexttype='222' afterparcount='5' containertype='65418'
- aftercontainercount='1' afterbegincount='3'>
-Yg4BAIQAAAAAAAAAAAA=
-</compositedata></par>
-<par def='1'><field type='text' kind='editable' name='title'/><compositedata
- type='98' prevtype='65418' nexttype='222' afterparcount='5' containertype='65418'
- aftercontainercount='1' afterbegincount='3'>
-Yg4BAIQAAAAAAAAAAAA=
-</compositedata></par>
-<par def='1'><field type='text' kind='editable' name='heir'/><compositedata
- type='98' prevtype='65418' nexttype='222' afterparcount='5' containertype='65418'
- aftercontainercount='1' afterbegincount='3'>
-Yg4BAIQAAAAAAAAAAAA=
-</compositedata></par>
-<par def='1'><field type='text' kind='editable' name='overlord'/><compositedata
- type='98' prevtype='65418' nexttype='222' afterparcount='5' containertype='65418'
- aftercontainercount='1' afterbegincount='3'>
-Yg4BAIQAAAAAAAAAAAA=
-</compositedata></par></richtext></body>
-<item name='$$ScriptName' summary='false' sign='true'><text>house</text></item></form>
diff --git a/samples/XPages/house.xsp b/samples/XPages/house.xsp
deleted file mode 100644
index 3c5a6e13..00000000
--- a/samples/XPages/house.xsp
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xp:view
-	xmlns:xp="http://www.ibm.com/xsp/core"
-	xmlns:xc="http://www.ibm.com/xsp/custom">
-	<xp:this.data>
-		<xp:dominoView
-			var="houses"
-			viewName="houses" />
-	</xp:this.data>
-	<xc:navbar />
-	<xp:div
-		id="uiContainer"
-		styleClass="container">
-		<div
-			class="row">
-			<div
-				class="col-md-6">
-				<div
-					class="panel panel-default">
-					<div
-						class="panel-heading">
-						<h3
-							class="panel-title">
-							<xp:text
-								value="House Details" />
-						</h3>
-					</div>
-					<div
-						class="panel-body">
-						<xp:form>
-							<xp:this.attrs>
-								<xp:attr
-									name="role"
-									value="form" />
-							</xp:this.attrs>
-							<div
-								class="form-group">
-								<xp:label
-									for="name"
-									value="Name" />
-								<xp:inputText
-									id="name"
-									value="#{gotHouse.name}" />
-							</div>
-							<div
-								class="form-group">
-								<xp:label
-									for="description"
-									value="Description" />
-								<xp:inputTextarea
-									id="description"
-									value="#{gotHouse.description}" >
-									<xp:this.attrs>
-										<xp:attr
-											name="rows"
-											value="5">
-										</xp:attr>
-									</xp:this.attrs>
-								</xp:inputTextarea>
-							</div>
-							<div
-								class="form-group">
-								<xp:label
-									for="coatOfArms"
-									value="Coat of Arms" />
-								<xp:inputText
-									id="coatOfArms"
-									value="#{gotHouse.coatOfArms}" />
-							</div>
-							<div
-								class="form-group">
-								<xp:label
-									for="words"
-									value="Words" />
-								<xp:inputText
-									id="words"
-									value="#{gotHouse.words}" />
-							</div>
-							<div
-								class="form-group">
-								<xp:label
-									for="seat"
-									value="Seat" />
-								<xp:inputText
-									id="seat"
-									value="#{gotHouse.seat}" />
-							</div>
-							<div
-								class="form-group">
-								<xp:label
-									for="currentLord"
-									value="Current Lord" />
-								<xp:inputText
-									id="currentLord"
-									value="#{gotHouse.currentLord}" />
-							</div>
-							<div
-								class="form-group">
-								<xp:label
-									for="region"
-									value="Region" />
-								<xp:inputText
-									id="region"
-									value="#{gotHouse.region}" />
-							</div>
-							<div
-								class="form-group">
-								<xp:label
-									for="title"
-									value="Title" />
-								<xp:inputText
-									id="title"
-									value="#{gotHouse.title}" />
-							</div>
-							<div
-								class="form-group">
-								<xp:label
-									for="heir"
-									value="Heir" />
-								<xp:inputText
-									id="heir"
-									value="#{gotHouse.heir}" />
-							</div>
-							<div
-								class="form-group">
-								<xp:label
-									for="overlord"
-									value="Overlord" />
-								<xp:inputText
-									id="overlord"
-									value="#{gotHouse.overlord}" />
-							</div>
-							<xp:button
-								id="buttonSaveGotHouse"
-								styleClass="pull-right btn-success"
-								value=" Save"
-								rendered="#{gotHouse.editMode}">
-								<xp:eventHandler
-									event="onclick"
-									refreshMode="partial"
-									refreshId="uiContainer"
-									submit="false">
-									<xp:this.action>
-										<xp:actionGroup>
-											<xp:executeScript
-												script="#{gotHouse.save}">
-											</xp:executeScript>
-											<xp:openPage
-												name="/index.xsp">
-											</xp:openPage>
-										</xp:actionGroup>
-									</xp:this.action>
-								</xp:eventHandler>
-								<i
-									class="fa fa-lg fa-save" />
-							</xp:button>
-							<xp:button
-								id="buttonEditGotHouse"
-								styleClass="pull-right btn-default"
-								value=" Edit"
-								rendered="#{!gotHouse.editMode}">
-								<xp:eventHandler
-									event="onclick"
-									action="#{gotHouse.edit}"
-									refreshMode="partial"
-									refreshId="uiContainer" />
-								<i
-									class="fa fa-lg fa-pencil" />
-							</xp:button>
-						</xp:form>
-					</div>
-				</div>
-			</div>
-		</div>
-	</xp:div>
-</xp:view>
\ No newline at end of file
diff --git a/samples/XPages/houses.view b/samples/XPages/houses.view
deleted file mode 100644
index 354c3aa0..00000000
--- a/samples/XPages/houses.view
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<view name='houses' xmlns='http://www.lotus.com/dxl' version='9.0' maintenanceversion='1.0'
- replicaid='88257E000001FF59' showinmenu='false' publicaccess='false' designerversion='8.5.3'
- unreadmarks='none' onopengoto='lastopened' onrefresh='displayindicator' headers='beveled'
- opencollapsed='false' showresponsehierarchy='true' showmargin='true' shrinkrows='false'
- extendlastcolumn='false' showhierarchies='false' unreadcolor='black' rowlinecount='1'
- headerlinecount='1' rowspacing='1' bgcolor='white' totalscolor='black' headerbgcolor='white'
- boldunreadrows='false' evaluateactions='false' allownewdocuments='false'
- allowcustomizations='false' hidemarginborder='false' marginwidth='0px' marginbgcolor='white'
- uniquekeys='false'>
-<noteinfo noteid='166' unid='045E775D8A3E562086257DB900789293' sequence='14'>
-<created><datetime>20141225T155658,43-06</datetime></created>
-<modified><datetime dst='true'>20150316T150218,60-07</datetime></modified>
-<revised><datetime dst='true'>20150316T150218,59-07</datetime></revised>
-<lastaccessed><datetime dst='true'>20150316T150218,60-07</datetime></lastaccessed>
-<addedtofile><datetime>20150305T162151,76-08</datetime></addedtofile></noteinfo>
-<updatedby><name>CN=Eric McCormick/O=Eric McCormick</name></updatedby>
-<wassignedby><name>CN=Eric McCormick/O=Eric McCormick</name></wassignedby><code
- event='selection'><formula>SELECT Form = "house"</formula></code>
-<actionbar bgcolor='#f0f0f0' bordercolor='black'>
-<actionbuttonstyle bgcolor='#f0f0f0'/><font color='system'/><border style='solid'
- width='0px 0px 1px' color='system'/>
-<action title='Categori_ze' showinbar='false' systemcommand='categorize'/>
-<action title='_Edit Document' showinbar='false' systemcommand='edit'/>
-<action title='_Send Document' showinbar='false' systemcommand='send'/>
-<action title='_Forward' showinbar='false' systemcommand='forward'/>
-<action title='_Move To Folder...' showinbar='false' systemcommand='movetofolder'/>
-<action title='_Remove From Folder' showinbar='false' systemcommand='removefromfolder'/>
-<action title='_Read' showinbar='false' systemcommand='markread'/>
-<action title='_Unread' showinbar='false' systemcommand='markunread'/>
-<action title='_Open in New Window' showinbar='false' systemcommand='openinnewwindow'/>
-<action title='_Print...' showinbar='false' systemcommand='print'/>
-<action title='_Delete' showinbar='false' systemcommand='delete'/>
-<action title='_Document Properties' showinbar='false' systemcommand='properties'/>
-<action title='C_ut' showinbar='false' systemcommand='cut'/>
-<action title='_Copy' showinbar='false' systemcommand='copy'/>
-<action title='Copy as Document _Link' showinbar='false' systemcommand='copyasdoclink'/>
-<action title='Copy as _Table' showinbar='false' systemcommand='copyastable'/>
-<action title='P_aste' showinbar='false' systemcommand='paste'/>
-<action title='_Open' showinbar='false' systemcommand='open'/>
-<action title='Bookmark' showinbar='false' systemcommand='bookmark'/></actionbar>
-<column sort='ascending' hidedetailrows='false' itemname='name' width='10'
- resizable='true' separatemultiplevalues='false' sortnoaccent='true' sortnocase='true'
- showaslinks='false'><columnheader title='name'><font size='9pt' style='bold'/></columnheader></column>
-<column sort='ascending' hidedetailrows='false' itemname='description' width='20.2500'
- resizable='true' separatemultiplevalues='false' sortnoaccent='true' sortnocase='true'
- showaslinks='false'><columnheader title='description'><font size='9pt' style='bold'/></columnheader></column>
-<column hidedetailrows='false' itemname='words' width='16.6250' resizable='true'
- separatemultiplevalues='false' sortnoaccent='false' sortnocase='true' showaslinks='false'><columnheader
- title='words'><font size='9pt' style='bold'/></columnheader></column>
-<column hidedetailrows='false' itemname='$0' width='22.6250' resizable='true'
- separatemultiplevalues='false' sortnoaccent='false' sortnocase='true' showaslinks='false'><columnheader
- title='unid'><font size='9pt' style='bold'/></columnheader><code event='value'><formula
->@Text(@DocumentUniqueID)</formula></code></column></view>
diff --git a/samples/XPages/navbar.xsp b/samples/XPages/navbar.xsp
deleted file mode 100755
index c7a5669e..00000000
--- a/samples/XPages/navbar.xsp
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xp:view
-	xmlns:xp="http://www.ibm.com/xsp/core">
-	<div
-		class="navbar navbar-default navbar-fixed-top"
-		role="navigation">
-		<div
-			class="navbar-header">
-			<button
-				type="button"
-				class="navbar-toggle"
-				data-toggle="collapse"
-				data-target=".navbar-collapse">
-				<xp:text
-					styleClass="sr-only"
-					value="Toggle navigation" />
-				<xp:repeat
-					value="#{3}">
-					<span
-						class="icon-bar" />
-				</xp:repeat>
-			</button>
-			<xp:link
-				styleClass="navbar-brand"
-				value="/"
-				text="#{database.title}" />
-		</div>
-		<div
-			class="collapse navbar-collapse">
-			<ul
-				class="nav navbar-nav navbar-right">
-				<xp:panel
-					tagName="li">
-					<xp:this.styleClass><![CDATA[${javascript:return view.getPageName()=="/index.xsp"?"active":null;}]]></xp:this.styleClass>
-					<xp:link
-						text=" Houses"
-						value="/index.xsp">
-						<i
-							class="fa fa-list fa-lg" />
-					</xp:link>
-				</xp:panel>
-				<xp:panel tagName="li">
-					<xp:this.styleClass><![CDATA[${javascript:return view.getPageName()=="/house.xsp"?"active":null;}]]></xp:this.styleClass>
-					<xp:link
-						text=" New House"
-						value="/house.xsp">
-						<i class="fa fa-plus-square fa-lg" />
-					</xp:link>
-				</xp:panel>
-			</ul>
-		</div>
-	</div>
-</xp:view>
\ No newline at end of file
diff --git a/samples/XPages/xLogin.xsp b/samples/XPages/xLogin.xsp
deleted file mode 100644
index 50afc329..00000000
--- a/samples/XPages/xLogin.xsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xp:view xmlns:xp="http://www.ibm.com/xsp/core">
- 
- 
-  <xp:span style="font-weight:bold;font-size:18pt">UserID</xp:span>
-  <xp:span style="font-weight:bold;font-size:18pt"> Login</xp:span>
-  <xp:br></xp:br>
- 
-  <xp:table>
-    <xp:tr>
-      <xp:td>
-        <xp:inputText id="userName1" style="width:275.0px"
-          required="true" value="#{TestLoginJavaBean.userName}"
-          disableClientSideValidation="true">
-        </xp:inputText>
-      </xp:td>
-      <xp:td>
-        <xp:label value="#{TestLoginJavaBean.message}" id="errMessage"
-          style="width:124.0px;color:rgb(117,11,11);font-weight:bold"></xp:label>
-      </xp:td>
-    </xp:tr>
-    <xp:tr>
-      <xp:td>
-        <xp:button value="Login" id="button1">
-          <xp:eventHandler event="onclick" submit="true"
-            refreshMode="complete" immediate="false" save="true" id="eventHandler1">
-            <xp:this.action><![CDATA[#{javascript:TestLoginJavaBean.doLoginUser()}]]></xp:this.action>
-          </xp:eventHandler>
-        </xp:button>
-      </xp:td>
-      <xp:td></xp:td>
-    </xp:tr>
-  </xp:table>
-  <xp:this.navigationRules>
-    <xp:navigationRule outcome="xsp-success" viewId="/xpwelcome.xsp"></xp:navigationRule>
-  </xp:this.navigationRules>
- 
-</xp:view>
\ No newline at end of file