Revert "Partial fix to the import dependency problem."

This reverts commit cbf40d5aa8563b5996afb42870a160da86017e27.
Cleaned up collect and interface.