remove debugging lines
break work functions out of import handler
Merge commit '417c' into generalise-importers
manual merge