diff --git a/data/quickstart/fragment-layout/academics-lo.fragment-layout.xml b/data/quickstart/fragment-layout/academics-lo.fragment-layout.xml
index fd2a27edb2..e58c461708 100644
--- a/data/quickstart/fragment-layout/academics-lo.fragment-layout.xml
+++ b/data/quickstart/fragment-layout/academics-lo.fragment-layout.xml
@@ -66,7 +66,6 @@
           <name>width</name>
           <value>50%</value>
         </structure-attribute>
-        <channel fname="sakai-connector" unremovable="false" hidden="false" immutable="false" ID="n16"/>
       </folder>
       <folder ID="s17" hidden="false" immutable="false" name="Column 2" type="regular" unremovable="false">
         <structure-attribute>
diff --git a/data/quickstart/fragment-layout/welcome-lo.fragment-layout.xml b/data/quickstart/fragment-layout/welcome-lo.fragment-layout.xml
index c73077a303..5b17587889 100644
--- a/data/quickstart/fragment-layout/welcome-lo.fragment-layout.xml
+++ b/data/quickstart/fragment-layout/welcome-lo.fragment-layout.xml
@@ -45,8 +45,6 @@
           <name>width</name>
           <value>60%</value>
         </structure-attribute>
-        <channel fname="email-preview-demo" unremovable="false" hidden="false" immutable="false" ID="n9" dlm:moveAllowed="false" dlm:deleteAllowed="false"/>
-        <channel fname="weather" unremovable="false" hidden="false" immutable="false" ID="n10"/>
         <channel fname="bookmarks" unremovable="false" hidden="false" immutable="false" ID="n11" dlm:moveAllowed="false" dlm:deleteAllowed="false"/>
       </folder>
       <folder ID="s12" hidden="false" immutable="false" name="Column" type="regular" unremovable="false">
diff --git a/data/quickstart/portlet-definition/email-preview-demo.portlet-definition.xml b/data/quickstart/portlet-definition/email-preview-demo.portlet-definition.xml
deleted file mode 100644
index f3516ae58a..0000000000
--- a/data/quickstart/portlet-definition/email-preview-demo.portlet-definition.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<portlet-definition xmlns="https://source.jasig.org/schemas/uportal/io/portlet-definition" xmlns:ns2="https://source.jasig.org/schemas/uportal" xmlns:ns3="https://source.jasig.org/schemas/uportal/io/user" xmlns:ns4="https://source.jasig.org/schemas/uportal/io/portlet-type" xmlns:ns5="https://source.jasig.org/schemas/uportal/io/stylesheet-descriptor" xmlns:ns6="https://source.jasig.org/schemas/uportal/io/permission-owner" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="4.0" xsi:schemaLocation="https://source.jasig.org/schemas/uportal/io/portlet-definition https://source.jasig.org/schemas/uportal/io/portlet-definition/portlet-definition-4.0.xsd">
-    <title>Email Preview Demo</title>
-    <name>Email Preview Demo</name>
-    <fname>email-preview-demo</fname>
-    <desc>Demo version of the Jasig Email Preview portlet</desc>
-    <type>Portlet</type>
-    <timeout>20000</timeout>
-    <portlet-descriptor>
-        <ns2:webAppName>/email-preview</ns2:webAppName>
-        <ns2:portletName>demo-email-preview</ns2:portletName>
-    </portlet-descriptor>
-    <category>Demonstration</category>
-    <group>Everyone</group>
-    <permissions>
-        <permission system="UP_PORTLET_SUBSCRIBE" activity="BROWSE">
-            <group>Everyone</group>
-        </permission>
-    </permissions>
-    <parameter>
-        <name>alternate</name>
-        <value>false</value>
-    </parameter>
-    <parameter>
-        <name>configurable</name>
-        <value>true</value>
-    </parameter>
-    <parameter>
-        <name>disableDynamicTitle</name>
-        <value>true</value>
-    </parameter>
-    <parameter>
-        <name>showChrome</name>
-        <value>true</value>
-    </parameter>
-    <parameter>
-        <name>hasHelp</name>
-        <value>true</value>
-    </parameter>
-    <parameter>
-        <name>blockImpersonation</name>
-        <value>false</value>
-    </parameter>
-    <parameter>
-        <name>hideFromMobile</name>
-        <value>false</value>
-    </parameter>
-    <parameter>
-        <name>highlight</name>
-        <value>false</value>
-    </parameter>
-    <parameter>
-        <name>editable</name>
-        <value>true</value>
-    </parameter>
-    <parameter>
-        <name>hasAbout</name>
-        <value>false</value>
-    </parameter>
-    <parameter>
-        <name>iconUrl</name>
-        <value>/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-mail.png</value>
-    </parameter>
-    <parameter>
-        <name>mobileIconUrl</name>
-        <value>/uPortal/media/skins/icons/mobile/email.png</value>
-    </parameter>
-    <portlet-preference>
-        <name>protocol</name>
-        <readOnly>true</readOnly>
-        <value>imaps</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>host</name>
-        <readOnly>true</readOnly>
-        <value>jasig.org</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>port</name>
-        <readOnly>true</readOnly>
-        <value>993</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>usernameSuffix</name>
-        <readOnly>true</readOnly>
-        <value>@jasig.org</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>linkServiceKey</name>
-        <readOnly>true</readOnly>
-        <value>default</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>helpTitle</name>
-        <readOnly>true</readOnly>
-        <value>Email Preview Demo</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>helpInstructions</name>
-        <readOnly>true</readOnly>
-        <value>This email portlet definition is for demonstration purposes only. To use this portlet in your portal, publish the non-demo version in Portlet Manager.</value>
-    </portlet-preference>
-</portlet-definition>
diff --git a/data/quickstart/portlet-definition/sakai-connector.portlet-definition.xml b/data/quickstart/portlet-definition/sakai-connector.portlet-definition.xml
deleted file mode 100644
index 3c4b5249c8..0000000000
--- a/data/quickstart/portlet-definition/sakai-connector.portlet-definition.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<portlet-definition version="4.0" xsi:schemaLocation="https://source.jasig.org/schemas/uportal/io/portlet-definition https://source.jasig.org/schemas/uportal/io/portlet-definition/portlet-definition-4.0.xsd" xmlns:ns2="https://source.jasig.org/schemas/uportal" xmlns="https://source.jasig.org/schemas/uportal/io/portlet-definition" xmlns:ns4="https://source.jasig.org/schemas/uportal/io/portlet-type" xmlns:ns3="https://source.jasig.org/schemas/uportal/io/user" xmlns:ns5="https://source.jasig.org/schemas/uportal/io/event-aggregation" xmlns:ns6="https://source.jasig.org/schemas/uportal/io/permission-owner" xmlns:ns7="https://source.jasig.org/schemas/uportal/io/subscribed-fragment" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns8="https://source.jasig.org/schemas/uportal/io/stylesheet-descriptor">
-    <title>Sakai Connector (demo)</title>
-    <name>Sakai Connector (demo)</name>
-    <fname>sakai-connector</fname>
-    <desc>Embed tools from any of your Sakai sites directly into the portal. Demo connection to Sakai Nightly demo site.</desc>
-    <type>Portlet</type>
-    <timeout>5000</timeout>
-    <portlet-descriptor>
-        <ns2:webAppName>/sakai-connector</ns2:webAppName>
-        <ns2:portletName>sakai-connector</ns2:portletName>
-    </portlet-descriptor>
-    <category>Academics</category>
-    <category>Demonstration</category>
-    <group>Authenticated Users</group>
-    <permissions>
-        <permission system="UP_PORTLET_SUBSCRIBE" activity="BROWSE">
-            <group>Authenticated Users</group>
-        </permission>
-    </permissions>
-    <parameter>
-        <name>alternate</name>
-        <value>false</value>
-    </parameter>
-    <parameter>
-        <name>blockImpersonation</name>
-        <value>false</value>
-    </parameter>
-    <parameter>
-        <name>configurable</name>
-        <value>true</value>
-    </parameter>
-    <parameter>
-        <name>disableDynamicTitle</name>
-        <value>false</value>
-    </parameter>
-    <parameter>
-        <name>editable</name>
-        <value>true</value>
-    </parameter>
-    <parameter>
-        <name>hasAbout</name>
-        <value>false</value>
-    </parameter>
-    <parameter>
-        <name>hasHelp</name>
-        <value>false</value>
-    </parameter>
-    <parameter>
-        <name>hideFromMobile</name>
-        <value>false</value>
-    </parameter>
-    <parameter>
-        <name>highlight</name>
-        <value>false</value>
-    </parameter>
-    <parameter>
-        <name>printable</name>
-        <value>false</value>
-    </parameter>
-    <parameter>
-        <name>showChrome</name>
-        <value>true</value>
-    </parameter>
-    <portlet-preference>
-        <name>adminPassword</name>
-        <readOnly>false</readOnly>
-        <value>admin</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>adminUsername</name>
-        <readOnly>false</readOnly>
-        <value>admin</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>allowedTools</name>
-        <readOnly>false</readOnly>
-        <value>sakai.announcements:sakai.singleuser:sakai.assignment.grades:blogger:sakai.dropbox:sakai.mailbox:sakai.forums:sakai.gradebook.tool:sakai.podcasts:sakai.poll:sakai.resources:sakai.schedule:sakai.samigo:sakai.rwiki</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>endpoint</name>
-        <readOnly>false</readOnly>
-        <value>http://nightly2.sakaiproject.org:8085/imsblti/provider/</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>key</name>
-        <readOnly>false</readOnly>
-        <value>uportal-integration</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>loginUrl</name>
-        <readOnly>false</readOnly>
-        <value>http://nightly2.sakaiproject.org:8085/sakai-axis/SakaiLogin.jws?wsdl</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>portletTitle</name>
-        <readOnly>false</readOnly>
-        <value>Sakai Connector (demo)</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>scriptUrl</name>
-        <readOnly>false</readOnly>
-        <value>http://nightly2.sakaiproject.org:8085/sakai-axis/SakaiScript.jws?wsdl</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>secret</name>
-        <readOnly>false</readOnly>
-        <value>secret</value>
-    </portlet-preference>
-</portlet-definition>
diff --git a/data/quickstart/portlet-definition/tips.portlet-definition.xml b/data/quickstart/portlet-definition/tips.portlet-definition.xml
index e7b45a56a9..ba7791d9ea 100644
--- a/data/quickstart/portlet-definition/tips.portlet-definition.xml
+++ b/data/quickstart/portlet-definition/tips.portlet-definition.xml
@@ -90,12 +90,7 @@
         <value>'Customize &lt; Layouts' allows you change the number of columns on a tab</value>
         <value>'Add Tab' lets you create your own tab on which you can put any portlets you want</value>
         <value>The Service Desk can reset your layout</value>
-        <value>Gmail users -- you can preview your Gmail in the portal</value>
-        <value>The Weather portlet lets you add other locations, so you can dream of vacationing in Hawaii or Aspen</value>
         <value>Bug reports are always appreciated -- use http://issues.jasig.org</value>
-        <value>The email summary portlet can read and delete messages, but not reply to, or compose new, messages</value>
-        <value>The email summary portlet can show there are attachments, but cannot show you the contents of an attachment</value>
-        <value>The email summary portlet's 'Inbox' link will take you to your email service's web-based mail client</value>
         <value>This portal is built on uPortal, which is open-source software to which many leading universities contribute</value>
     </portlet-preference>
 </portlet-definition>
diff --git a/data/quickstart/portlet-definition/weather.portlet-definition.xml b/data/quickstart/portlet-definition/weather.portlet-definition.xml
deleted file mode 100644
index 23d528e1a3..0000000000
--- a/data/quickstart/portlet-definition/weather.portlet-definition.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<portlet-definition xmlns="https://source.jasig.org/schemas/uportal/io/portlet-definition" xmlns:ns2="https://source.jasig.org/schemas/uportal" xmlns:ns3="https://source.jasig.org/schemas/uportal/io/permission-owner" xmlns:ns4="https://source.jasig.org/schemas/uportal/io/stylesheet-descriptor" xmlns:ns5="https://source.jasig.org/schemas/uportal/io/portlet-type" xmlns:ns6="https://source.jasig.org/schemas/uportal/io/user" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="4.0" xsi:schemaLocation="https://source.jasig.org/schemas/uportal/io/portlet-definition https://source.jasig.org/schemas/uportal/io/portlet-definition/portlet-definition-4.0.xsd">
-    <title>Weather</title>
-    <name>Weather</name>
-    <fname>weather</fname>
-    <desc>Current weather conditions and forecast.</desc>
-    <type>Portlet</type>
-    <timeout>15000</timeout>
-    <portlet-descriptor>
-        <ns2:webAppName>/WeatherPortlet</ns2:webAppName>
-        <ns2:portletName>Weather</ns2:portletName>
-    </portlet-descriptor>
-    <category>Information</category>
-    <group>Everyone</group>
-    <permissions>
-        <permission system="UP_PORTLET_SUBSCRIBE" activity="BROWSE">
-            <group>Everyone</group>
-        </permission>
-    </permissions>
-    <parameter>
-        <name>iconUrl</name>
-        <value>/ResourceServingWebapp/rs/tango/0.8.90/32x32/status/weather-few-clouds.png</value>
-    </parameter>
-    <parameter>
-        <name>mobileIconUrl</name>
-        <value>/uPortal/media/skins/icons/mobile/weather.png</value>
-    </parameter>
-    <parameter>
-        <name>editable</name>
-        <value>true</value>
-    </parameter>
-    <portlet-preference>
-        <name>locationCodes</name>
-        <readOnly>false</readOnly>
-        <value>2459115</value>
-        <value>1118370</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>locations</name>
-        <readOnly>false</readOnly>
-        <value>New York, NY</value>
-        <value>Tokyo, Japan(Tokyo)</value>
-    </portlet-preference>
-    <portlet-preference>
-        <name>units</name>
-        <readOnly>false</readOnly>
-        <value>F</value>
-        <value>C</value>
-    </portlet-preference>
-</portlet-definition>