Removed array_map calls