diff --git a/src/event/mod.rs b/src/event/mod.rs
index e477802..1992097 100644
--- a/src/event/mod.rs
+++ b/src/event/mod.rs
@@ -14,7 +14,7 @@ pub enum Event {
 
 pub struct Envelope {
     pub from: Option<String>,
-    pub event: Arc<Event>,
+    pub event: Event,
     pub to: Vec<String>
 }
 
@@ -22,7 +22,7 @@ impl Envelope {
     pub fn new (event: Event) -> Envelope {
         Envelope {
             from: None,
-            event: Arc::new(event),
+            event: event,
             to: vec![]
         }
     }
diff --git a/src/modules/echo.rs b/src/modules/echo.rs
index 1dbf6e7..e88762e 100644
--- a/src/modules/echo.rs
+++ b/src/modules/echo.rs
@@ -28,7 +28,7 @@ impl Module for EchoModule {
         loop {
             match receiver.recv() {
                 Ok(envelope) => {
-                    match *envelope.event {
+                    match envelope.event {
                         Event::Message { ref message } => {
                             debug!("Received message... {:?}", message.content);
                             match split_command(&message.content) {
diff --git a/src/modules/echobox.rs b/src/modules/echobox.rs
index 974647d..b477374 100644
--- a/src/modules/echobox.rs
+++ b/src/modules/echobox.rs
@@ -37,7 +37,7 @@ impl Module for EchoboxModule {
         loop {
             match receiver.recv() {
                 Ok(envelope) => {
-                    match *envelope.event {
+                    match envelope.event {
                         Event::Message { ref message } => {
                             debug!("Received message... {:?}", message.content);
                             match split_command(&message.content) {
diff --git a/src/modules/pvn.rs b/src/modules/pvn.rs
index 0337d76..93c3b9a 100644
--- a/src/modules/pvn.rs
+++ b/src/modules/pvn.rs
@@ -144,7 +144,7 @@ impl Module for PvnModule {
         loop {
             match receiver.recv() {
                 Ok(envelope) => {
-                    match *envelope.event {
+                    match envelope.event {
                         Event::Message { ref message } => {
                             let command = split_command(&message.content);
                             debug!("Received message... {:?}", &message.content);
diff --git a/src/modules/random.rs b/src/modules/random.rs
index 34b0f12..d5546d8 100644
--- a/src/modules/random.rs
+++ b/src/modules/random.rs
@@ -41,7 +41,7 @@ impl Module for RandomModule {
         loop {
             match receiver.recv() {
                 Ok(envelope) => {
-                    match *envelope.event {
+                    match envelope.event {
                         Event::Message { ref message } => {
                             debug!("Received message... {:?}", message.content);
                             match split_command(&message.content) {