diff --git a/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m b/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m
index 7a979ee9c158623871358bbec1b49ceb14657a5e..e8b9000b9cfeb78ba3e21e88e8d82ba6eeba4559 100644
--- a/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m
+++ b/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m
@@ -24,11 +24,6 @@
 #import "CISDOBIpadEntity.h"
 #import "CISDOBIpadService.h"
 
-// In a preliminary version, the properties were trasmitted as a dictionary. The updated
-// version sends them as an array. Temporarily support both modes, but once all servers
-// have been updated to the array version, remove this code.
-#define SUPPORT_PROPERTIES_DICT 1
-
 ///! Convert a JSON string to objects. Returns nil if the string is nil.
 id ObjectFromJsonData(NSString *jsonDataString, NSError **error)
 {
@@ -87,27 +82,6 @@ id ObjectFromJsonData(NSString *jsonDataString, NSError **error)
     return refcon;
 }
 
-// This code is only temporarily necessary. See comment to SUPPORT_PROPERTIES_DICT.
-- (NSArray *)propertiesArrayFromDictionaryOrError:(NSError **)error
-{
-    NSMutableArray* properties;
-    NSDictionary *propertiesDict = ObjectFromJsonData(self.propertiesJson, error);
-    if (!propertiesDict) return nil;
-    properties = [[NSMutableArray alloc] init];
-    for (NSString *key in [propertiesDict allKeys]) {
-        NSDictionary *property = [NSDictionary dictionaryWithObjectsAndKeys:
-            key, @"key",
-            key, @"label",
-            [propertiesDict valueForKey: key], @"value", nil];
-        [properties addObject: property];
-    }
-    [properties sortUsingComparator: ^NSComparisonResult(NSDictionary *obj1, NSDictionary *obj2) {
-        return [[obj1 valueForKey: @"key"] compare: [obj2 valueForKey: @"key"] options: NSNumericSearch];
-    }];
-    
-    return properties;
-}
-
 - (NSArray *)properties
 {
     [self willAccessValueForKey: @"properties"];
@@ -117,10 +91,6 @@ id ObjectFromJsonData(NSString *jsonDataString, NSError **error)
     if (nil == properties) {
         NSError *error;
         properties = ObjectFromJsonData(self.propertiesJson, &error);
-#if SUPPORT_PROPERTIES_DICT
-        if ([properties isKindOfClass: [NSDictionary class]])
-            properties = [self propertiesArrayFromDictionaryOrError: &error];
-#endif
         if (error) {
             NSLog(@"Could not deserialize properties %@", error);
         } else {
@@ -131,7 +101,6 @@ id ObjectFromJsonData(NSString *jsonDataString, NSError **error)
     return properties;
 }
 
-
 - (NSArray *)childrenPermIds
 {
     [self willAccessValueForKey: @"childrenPermIds"];
diff --git a/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate b/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate
index d298da910d69713199a79f37d5d91305f99bc1df..c986ceab3fc0bd17e4db956a12998033770d3c6c 100644
Binary files a/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate and b/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate
index b8aa5bbb4faed569a7feb57f158207b525a68e6e..35c3954f70b11c5ecbac73f9e21d02a690a95fbd 100644
Binary files a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate and b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate differ