removed ecmascript 6 forEach and map