cleanup and updates per parent martha-core