just a little cleanup
goes with LHCb!4533 (merged) DaVinci!1048 (merged) LHCbIntegrationTests!69 (merged) !3799 (merged) Moore!3343 (merged)