cleanup the global imports

David Schäferrequested to merge
imports into develop

Adresses #225 (closed)

Merge request reports