remove more redundant code, no change in tests pass/fail
more rerender WIP