Remove some commented out import/export, and debug.