Revert "Introduced some interfaces to redesign."

This reverts commit 8d42eda2af917c52d74c9792f3c6d584dd5f99e3.