remove use of firstObject