Revert "code clean up"

This reverts commit 6142dadf77e148cedfb9169d8db36a2e9a3e0c61.
clean up code