Revert "temporary stuffs for testing"

This reverts commit 555d9f7e80349fc512c6ae8885309227cfb5b1ff.