diff --git a/ChangeLog b/ChangeLog
index f7e8827..ded6497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-02  Matt Rice  <ratmice@gmail.com>
+
+	* DBModeler/ModelerAttributeEditor.m (dealloc): Remove observers and
+	release the selection, remove unused ivar.
+	(selectionDidChange:): Remove unused local.
+	* DBModeler/ModelerAttributeEditor.h: Remove unused ivar.
+
 2009-03-01  Matt Rice  <ratmice@gmail.com>
 
 	* DBModeler/Inspectors/AttributesInspector.m: Implement
diff --git a/DBModeler/ModelerAttributeEditor.h b/DBModeler/ModelerAttributeEditor.h
index 75cbfc5..0245732 100644
--- a/DBModeler/ModelerAttributeEditor.h
+++ b/DBModeler/ModelerAttributeEditor.h
@@ -41,7 +41,6 @@
   EODisplayGroup *_attributes_dg;
   EODisplayGroup *_relationships_dg;
   id _entityToObserve;
-  id _attributeToObserve;
   NSArray *_oldSelection;
 }
 
diff --git a/DBModeler/ModelerAttributeEditor.m b/DBModeler/ModelerAttributeEditor.m
index bdb4941..396fe71 100644
--- a/DBModeler/ModelerAttributeEditor.m
+++ b/DBModeler/ModelerAttributeEditor.m
@@ -198,10 +198,19 @@
 
 - (void) dealloc
 {
+  int i, c;
+
   if (_entityToObserve)
     [EOObserverCenter removeObserver:self forObject:_entityToObserve];
-  if (_attributeToObserve)
-    [EOObserverCenter removeObserver:self forObject:_attributeToObserve];
+
+  c = [_oldSelection count];
+  for (i = 0; i < c; i++)
+    {
+      [EOObserverCenter removeObserver:self 
+			forObject:[_oldSelection objectAtIndex:i]];
+    }
+
+  RELEASE(_oldSelection);
   RELEASE(_mainView);
   RELEASE(_relationships_dg);
   RELEASE(_attributes_dg);
@@ -269,7 +278,6 @@
 
 - (void) selectionDidChange:(NSNotification *)notif
 {
-  EOModelerDocument *doc = [notif object];
   NSArray *newSelection = [[EOMApp currentEditor] selectionWithinViewedObject];
   int i, c;