Revert "cleanup code changes."

This reverts commit 2b49ea5a87e84159c2a5fba07a308d037cf30bb0.