Merge branch 'MBP-136-clean-up-the-code' of https://bitbucket.org/europeanspallationsource/tc_generic_structure into MBP-136-clean-up-the-code
Merge branch 'MBP-136-clean-up-the-code' of https://bitbucket.org/europeanspallationsource/tc_generic_structure into MBP-136-clean-up-the-code