clean and notice fixes CRM-12966
Merge pull request #1122 from kurund/CRM-12966

clean and notice fixes CRM-12966