removed some pointless NSString checking code