commented some code we don't need for MIRA that we do use in TDL
Merge remote branch 'origin/master'