code cleanup
Revert "code cleanup"

This reverts commit c01777244ffd1d340f870b2cd319869c52c6daf6.
code cleanup