Optim: remove last managed loop that picks between dynamic waves and static water 1k test with waves shaves off ~0.25ms - 1.55ms vs previous 1.8ms Tests: ran unit tests