Refactorized to core, pending log capture error
Removed actions, utils