diff --git a/Controller/Adminhtml/Emailcatcher/Cleanup.php b/Controller/Adminhtml/Emailcatcher/Cleanup.php
new file mode 100644
index 0000000..6ea9a9d
--- /dev/null
+++ b/Controller/Adminhtml/Emailcatcher/Cleanup.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * A Magento 2 module named Experius/EmailCatcher
+ * Copyright (C) 2016 Derrick Heesbeen
+ *
+ * This file included in Experius/EmailCatcher is licensed under OSL 3.0
+ *
+ * http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * Please see LICENSE.txt for the full text of the OSL 3.0 license
+ */
+
+namespace Experius\EmailCatcher\Controller\Adminhtml\Emailcatcher;
+
+
+class Cleanup extends \Magento\Backend\App\Action {
+
+    protected $clean;
+
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Experius\EmailCatcher\Cron\Clean $clean
+    ){
+        $this->clean = $clean;
+
+        parent::__construct($context);
+    }
+
+
+    public function execute(){
+
+        $resultRedirect = $this->resultRedirectFactory->create();
+
+        try {
+            $deleteCount = $this->clean->execute();
+        } catch (\Exception $e){
+            $this->messageManager->addError($e->getMessage());
+            return $resultRedirect->setPath('*/*/');
+        }
+
+        $this->messageManager->addSuccessMessage(__('Removed %1 records from %2 days ago or older',$deleteCount,'30'));
+
+        return $resultRedirect->setPath('*/*/');
+    }
+}
diff --git a/Cron/Clean.php b/Cron/Clean.php
new file mode 100644
index 0000000..aefd731
--- /dev/null
+++ b/Cron/Clean.php
@@ -0,0 +1,50 @@
+<?php
+
+
+namespace Experius\EmailCatcher\Cron;
+
+class Clean
+{
+
+    protected $logger;
+
+    protected $resourceConnection;
+
+    /**
+     * Constructor
+     *
+     * @param \Psr\Log\LoggerInterface $logger
+     */
+    public function __construct(
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\App\ResourceConnection $resourceConnection
+    ){
+        $this->logger = $logger;
+        $this->resourceConnection = $resourceConnection;
+        $this->connection = $this->resourceConnection->getConnection();
+    }
+
+    /**
+     * Execute the cron
+     *
+     * @return void
+     */
+    public function execute()
+    {
+
+        $numberOfDays = 30;
+
+        $where = "created_at < '" . date('c', time()-($numberOfDays*(3600*24))) ."'";
+
+        $deleteCount = $this->connection->delete(
+            $this->resourceConnection->getTableName('experius_emailcatcher'),
+            $where
+        );
+
+        $this->logger->addInfo(__('Experius EmailCatcher Cleanup: Removed %1 records',$deleteCount));
+
+        return $deleteCount;
+    }
+
+
+}
\ No newline at end of file
diff --git a/etc/crontab.xml b/etc/crontab.xml
new file mode 100644
index 0000000..767574d
--- /dev/null
+++ b/etc/crontab.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" ?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
+    <group id="default">
+        <job instance="Experius\EmailCatcher\Cron\Clean" method="execute" name="experius_emailcatcher_clean">
+            <schedule>0 3 * * *</schedule>
+        </job>
+    </group>
+</config>
\ No newline at end of file
diff --git a/view/adminhtml/ui_component/experius_emailcatcher_index.xml b/view/adminhtml/ui_component/experius_emailcatcher_index.xml
index ac8c071..80360a5 100644
--- a/view/adminhtml/ui_component/experius_emailcatcher_index.xml
+++ b/view/adminhtml/ui_component/experius_emailcatcher_index.xml
@@ -10,6 +10,14 @@
 			<item name="deps" xsi:type="string">experius_emailcatcher_index.experius_emailcatcher_grid_data_source</item>
 		</item>
 		<item name="spinner" xsi:type="string">experius_emailcatcher_columns</item>
+		<item name="buttons" xsi:type="array">
+			<item name="add" xsi:type="array">
+				<item name="name" xsi:type="string">cleanup</item>
+				<item name="label" translate="true" xsi:type="string">Run Cleanup</item>
+				<item name="url" xsi:type="string">*/*/cleanup</item>
+				<!--<item name="on_click" xsi:type="string">deleteConfirm('Are you sure you want to do this?')</item>-->
+			</item>
+		</item>
 	</argument>
 	<dataSource name="experius_emailcatcher_grid_data_source">
 		<argument name="dataProvider" xsi:type="configurableObject">