Remove Diagnostic stuff -> refactor into handler classes and seperate csv stuff