Revert "Partial fix to the import dependency problem."

This reverts commit e265f1a5845ee58654916fa97b82c160dc5a958f.
Cleaned up collect and interface.