final clean up(CRM-12463)
Merge pull request #676 from yashodha/SOFT

final clean up(CRM-12463)
more fixes
notice fix