Cleanup/gridmanager only include what we use

Merged Timo Koch requested to merge cleanup/gridmanager-only-include-what-we-use into master

Merge request reports