code clean up for import/export workspace