Removing race specific optimization