diff --git a/ChangeLog b/ChangeLog
index c6861af..58879ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-17  David Ayers  <d.ayers@inode.at>
+
+	* EOAccess/EOEntity.m: Remove unnecessary include.
+	(-setClassProperties:, -setPrimaryKeyAttributes:)
+	(-setAttributesUsedForLocking:): Remove unnecessary casts.
+	
 2005-02-16  David Ayers  <d.ayers@inode.at>
 
 	* EOControl/EOClassDescription.m ([NSObject-snapshot]):
diff --git a/EOAccess/EOEntity.m b/EOAccess/EOEntity.m
index b8c330c..e662026 100644
--- a/EOAccess/EOEntity.m
+++ b/EOAccess/EOEntity.m
@@ -47,7 +47,6 @@ RCS_ID("$Id$")
 #include <Foundation/NSSet.h>
 #include <Foundation/NSEnumerator.h>
 #include <Foundation/NSValue.h>
-#include <Foundation/NSNull.h>
 #include <Foundation/NSProcessInfo.h>
 #include <Foundation/NSFileManager.h>
 #include <Foundation/NSFormatter.h>
@@ -2142,9 +2141,9 @@ createInstanceWithEditingContext:globalID:zone:
   DESTROY(_classProperties);
   if ([properties isKindOfClass:[GCArray class]]
       || [properties isKindOfClass: [GCMutableArray class]])
-    _classProperties = [((NSArray*)[GCMutableArray alloc]) initWithArray: properties];
+    _classProperties = [[GCMutableArray alloc] initWithArray: properties];
   else
-    _classProperties = [((NSArray*)[GCMutableArray alloc]) initWithArray: properties]; //TODO
+    _classProperties = [[GCMutableArray alloc] initWithArray: properties]; //TODO
 
   [self _setIsEdited]; //To clean cache
 
@@ -2163,9 +2162,9 @@ createInstanceWithEditingContext:globalID:zone:
 
   if ([keys isKindOfClass:[GCArray class]]
       || [keys isKindOfClass: [GCMutableArray class]])
-    _primaryKeyAttributes = [((NSArray*)[GCMutableArray alloc]) initWithArray: keys];
+    _primaryKeyAttributes = [[GCMutableArray alloc] initWithArray: keys];
   else
-    _primaryKeyAttributes = [((NSArray*)[GCMutableArray alloc]) initWithArray: keys]; // TODO
+    _primaryKeyAttributes = [[GCMutableArray alloc] initWithArray: keys]; // TODO
   
   [self _setIsEdited];//To clean cache
 
@@ -2184,10 +2183,10 @@ createInstanceWithEditingContext:globalID:zone:
   
   if ([attributes isKindOfClass: [GCArray class]]   // TODO
       || [attributes isKindOfClass: [GCMutableArray class]])
-    _attributesUsedForLocking = [((NSArray*)[GCMutableArray alloc])
+    _attributesUsedForLocking = [[GCMutableArray alloc]
 				  initWithArray: attributes];
   else
-    _attributesUsedForLocking = [((NSArray*)[GCMutableArray alloc])
+    _attributesUsedForLocking = [[GCMutableArray alloc]
 				  initWithArray: attributes];
   
   [self _setIsEdited]; //To clean cache