alert fix and remove some non functional macros
Merge branch 'master' into bulkEdit-dsc-379
remove comments
remove comments
Merge pull request #554 from nla/bulkEdit-dsc-379

Bulk fix issue with alert message