Feature/remove continue

Merged Christoph Grüninger requested to merge feature/remove-continue into master

several cleanups

Merge request reports