pure functional movement, which means an infinite map!
removed vestigal code