diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
index acfed89ba..4661c5b7b 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
@@ -2309,7 +2309,7 @@ public void registrationStateChanged(RegistrationStateChangeEvent event)
         {
             ProtocolProviderServiceSipImpl listener
                 = (ProtocolProviderServiceSipImpl) event.getProvider();
-            this.sipStackSharing.removeSipListener(listener);
+            sipStackSharing.removeSipListener(listener);
             listener.removeRegistrationStateChangeListener(this);
         }
     }
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipStackSharing.java b/src/net/java/sip/communicator/impl/protocol/sip/SipStackSharing.java
index bd4b1404a..0c54d877c 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/SipStackSharing.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/SipStackSharing.java
@@ -16,7 +16,6 @@
 import javax.sip.message.*;
 
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
 /**