Revert "cleanup"

This reverts commit c20e1f6c59164535223fb5cfd8a2aa466edf63aa.
Revert "discard unaccesary contect"

This reverts commit 5417c8d9974bcdba0914b0df0ca7bca41fa8c6b3.