stepwise commit while cleaning up evo3 code