Revert "more simplification (bench=3859940)"

This reverts commit 85d69ae618bc536a04fa939eea6110eccd26bb8e.
cleanup useless code (4164062)