Cleaning of code and fixing the missing outcome measures in the xml of final scenario.