diff --git a/modules/StaticPages/Events/CreateNewStaticPage.php b/modules/StaticPages/Events/CreateNewStaticPage.php
deleted file mode 100644
index 72b2ec7f..00000000
--- a/modules/StaticPages/Events/CreateNewStaticPage.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-namespace Modules\StaticPages\Events;
-
-use App\Events\Event;
-use App\Models\Content;
-use Illuminate\Queue\SerializesModels;
-
-class CreateNewStaticPage extends Event {
-    use SerializesModels;
-    /**
-     * @var Content
-     */
-    public $page;
-
-    /**
-     * Create a new event instance.
-     *
-     * @param Content $page
-     */
-
-    public function __construct(Content $page)
-    {
-        $this->page = $page;
-    }
-}
\ No newline at end of file
diff --git a/modules/StaticPages/Events/DeleteStaticPage.php b/modules/StaticPages/Events/DeleteStaticPage.php
deleted file mode 100644
index 4df44630..00000000
--- a/modules/StaticPages/Events/DeleteStaticPage.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace Modules\StaticPages\Events;
-
-use App\Events\Event;
-use App\Models\Content;
-use Illuminate\Queue\SerializesModels;
-
-class DeleteStaticPage extends Event {
-    use SerializesModels;
-    /**
-     * @var Content
-     */
-    public $page;
-    public $revision;
-
-    /**
-     * Create a new event instance.
-     *
-     * @param Content $page
-     * @param         $revision
-     */
-    public function __construct(Content $page, $revision)
-    {
-        $this->page = $page;
-        $this->revision = $revision;
-    }
-}
\ No newline at end of file
diff --git a/modules/StaticPages/Events/EditStaticPage.php b/modules/StaticPages/Events/EditStaticPage.php
deleted file mode 100644
index ebfc4f29..00000000
--- a/modules/StaticPages/Events/EditStaticPage.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-namespace Modules\StaticPages\Events;
-
-use App\Events\Event;
-use App\Models\Content;
-use Illuminate\Queue\SerializesModels;
-
-class EditStaticPage extends Event {
-    use SerializesModels;
-    /**
-     * @var Content
-     */
-    public $page;
-    public $revision;
-
-    /**
-     * Create a new event instance.
-     *
-     * @param Content $page
-     * @param         $revision
-     */
-
-    public function __construct(Content $page, $revision)
-    {
-        $this->page = $page;
-        $this->revision = $revision;
-    }
-}
\ No newline at end of file
diff --git a/modules/StaticPages/Events/MakeDraftFromStaticPage.php b/modules/StaticPages/Events/MakeDraftFromStaticPage.php
deleted file mode 100644
index fabed846..00000000
--- a/modules/StaticPages/Events/MakeDraftFromStaticPage.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-namespace Modules\StaticPages\Events;
-
-use App\Events\Event;
-use App\Models\Content;
-use Illuminate\Queue\SerializesModels;
-
-class MakeDraftFromStaticPage extends Event {
-    use SerializesModels;
-    /**
-     * @var Content
-     */
-    public $page;
-    public $revision;
-
-    /**
-     * Create a new event instance.
-     *
-     * @param Content $page
-     * @param         $revision
-     */
-
-    public function __construct(Content $page, $revision)
-    {
-        $this->page = $page;
-        $this->revision = $revision;
-    }
-}
\ No newline at end of file
diff --git a/modules/StaticPages/Events/PublishStaticPage.php b/modules/StaticPages/Events/PublishStaticPage.php
deleted file mode 100644
index 8e1b6109..00000000
--- a/modules/StaticPages/Events/PublishStaticPage.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-namespace Modules\StaticPages\Events;
-
-use App\Events\Event;
-use App\Models\Content;
-use Illuminate\Queue\SerializesModels;
-
-class PublishStaticPage extends Event {
-    use SerializesModels;
-    /**
-     * @var Content
-     */
-    public $page;
-
-    public $revision;
-
-    /**
-     * Create a new event instance.
-     *
-     * @param Content $page
-     * @param         $revision
-     */
-
-    public function __construct(Content $page, $revision)
-    {
-        $this->page = $page;
-        $this->revision = $revision;
-    }
-}
\ No newline at end of file
diff --git a/modules/StaticPages/Listeners/LogCreateNewStaticPage.php b/modules/StaticPages/Listeners/LogCreateNewStaticPage.php
deleted file mode 100644
index f85c7a1f..00000000
--- a/modules/StaticPages/Listeners/LogCreateNewStaticPage.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace Modules\StaticPages\Listeners;
-
-use App\Listeners\Logger;
-use Modules\StaticPages\Events\CreateNewStaticPage;
-
-class LogCreateNewStaticPage extends Logger {
-    /**
-     * Getter for action name. Used only internally
-     *
-     * @return mixed
-     */
-    protected function getName()
-    {
-        return 'staticpages::createNew';
-    }
-
-    public function handle(CreateNewStaticPage $event) {
-        $parameters = [
-            'id' => $event->page->id,
-            'url' => $event->page->url,
-            'title' => $event->page->title
-        ];
-
-        $this->saveLog($parameters);
-    }
-}
diff --git a/modules/StaticPages/Listeners/LogDeleteStaticPage.php b/modules/StaticPages/Listeners/LogDeleteStaticPage.php
deleted file mode 100644
index ee2b09ec..00000000
--- a/modules/StaticPages/Listeners/LogDeleteStaticPage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-namespace Modules\StaticPages\Listeners;
-
-use App\Listeners\Logger;
-use Modules\StaticPages\Events\DeleteStaticPage;
-
-class LogDeleteStaticPage extends Logger
-{
-    /**
-     * Getter for action name. Used only internally
-     *
-     * @return mixed
-     */
-    protected function getName()
-    {
-        return 'staticpages::delete';
-    }
-
-    public function handle(DeleteStaticPage $event)
-    {
-        $parameters = [
-            'id'    => $event->page->id,
-            'url'   => $event->page->url,
-            'title' => $event->page->title,
-            'revision' => $event->revision
-        ];
-
-        $this->saveLog($parameters);
-    }
-}
diff --git a/modules/StaticPages/Listeners/LogEditStaticPage.php b/modules/StaticPages/Listeners/LogEditStaticPage.php
deleted file mode 100644
index d70a3d37..00000000
--- a/modules/StaticPages/Listeners/LogEditStaticPage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-namespace Modules\StaticPages\Listeners;
-
-use App\Listeners\Logger;
-use Modules\StaticPages\Events\EditStaticPage;
-
-class LogEditStaticPage extends Logger
-{
-    /**
-     * Getter for action name. Used only internally
-     *
-     * @return mixed
-     */
-    protected function getName()
-    {
-        return 'staticpages::edit';
-    }
-
-    public function handle(EditStaticPage $event)
-    {
-        $parameters = [
-            'id'    => $event->page->id,
-            'url'   => $event->page->url,
-            'title' => $event->page->title,
-            'revision' => $event->revision
-        ];
-
-        $this->saveLog($parameters);
-    }
-}
diff --git a/modules/StaticPages/Listeners/LogMakeDraftFromStaticPage.php b/modules/StaticPages/Listeners/LogMakeDraftFromStaticPage.php
deleted file mode 100644
index 7b6eeb4c..00000000
--- a/modules/StaticPages/Listeners/LogMakeDraftFromStaticPage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-namespace Modules\StaticPages\Listeners;
-
-use App\Listeners\Logger;
-use Modules\StaticPages\Events\MakeDraftFromStaticPage;
-
-class LogMakeDraftFromStaticPage extends Logger
-{
-    /**
-     * Getter for action name. Used only internally
-     *
-     * @return mixed
-     */
-    protected function getName()
-    {
-        return 'staticpages::makeDraft';
-    }
-
-    public function handle(MakeDraftFromStaticPage $event)
-    {
-        $parameters = [
-            'id'    => $event->page->id,
-            'url'   => $event->page->url,
-            'title' => $event->page->title,
-            'revision' => $event->revision
-        ];
-
-        $this->saveLog($parameters);
-    }
-}
diff --git a/modules/StaticPages/Listeners/LogPublishStaticPage.php b/modules/StaticPages/Listeners/LogPublishStaticPage.php
deleted file mode 100644
index 2afd9e55..00000000
--- a/modules/StaticPages/Listeners/LogPublishStaticPage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-namespace Modules\StaticPages\Listeners;
-
-use App\Listeners\Logger;
-use Modules\StaticPages\Events\PublishStaticPage;
-
-class LogPublishStaticPage extends Logger
-{
-    /**
-     * Getter for action name. Used only internally
-     *
-     * @return mixed
-     */
-    protected function getName()
-    {
-        return 'staticpages::publish';
-    }
-
-    public function handle(PublishStaticPage $event)
-    {
-        $parameters = [
-            'id'    => $event->page->id,
-            'url'   => $event->page->url,
-            'title' => $event->page->title,
-            'revision' => $event->revision
-        ];
-
-        $this->saveLog($parameters);
-    }
-}
diff --git a/modules/StaticPages/Providers/.gitkeep b/modules/StaticPages/Providers/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/modules/StaticPages/Providers/EventServiceProvider.php b/modules/StaticPages/Providers/EventServiceProvider.php
deleted file mode 100644
index c97fbec5..00000000
--- a/modules/StaticPages/Providers/EventServiceProvider.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Modules\StaticPages\Providers;
-
-use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
-use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-
-class EventServiceProvider extends ServiceProvider
-{
-    /**
-     * The event listener mappings for the application.
-     *
-     * @var array
-     */
-    protected $listen = [
-        'Modules\StaticPages\Events\CreateNewStaticPage' => [
-            'Modules\StaticPages\Listeners\LogCreateNewStaticPage'
-        ],
-        'Modules\StaticPages\Events\EditStaticPage' => [
-            'Modules\StaticPages\Listeners\LogEditStaticPage'
-        ],
-        'Modules\StaticPages\Events\PublishStaticPage' => [
-            'Modules\StaticPages\Listeners\LogPublishStaticPage'
-        ],
-        'Modules\StaticPages\Events\DeleteStaticPage' => [
-            'Modules\StaticPages\Listeners\LogDeleteStaticPage'
-        ],
-    ];
-
-    /**
-     * Register any other events for your application.
-     *
-     * @param  \Illuminate\Contracts\Events\Dispatcher  $events
-     * @return void
-     */
-    public function boot(DispatcherContract $events)
-    {
-        parent::boot($events);
-    }
-}
diff --git a/modules/StaticPages/Providers/StaticPagesServiceProvider.php b/modules/StaticPages/Providers/StaticPagesServiceProvider.php
index 356656db..c4974564 100644
--- a/modules/StaticPages/Providers/StaticPagesServiceProvider.php
+++ b/modules/StaticPages/Providers/StaticPagesServiceProvider.php
@@ -36,8 +36,6 @@ class StaticPagesServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        // register event provider for firing module-specific events
-        $this->app->register('Modules\StaticPages\Providers\EventServiceProvider');
     }
 
 //    /**