CRM-12943: Cleanup
----------------------------------------
* CRM-12943
  http://issues.civicrm.org/jira/browse/CRM-12943