Cleanup model
Move External helpers to core