Removed legacy XSL thigns
Merge branch 'dev' into ms