Remove dead files
Merge branch 'master' into conditions
Apply CR
Merge branch 'master' into conditions
Apply CR