initial after split from TeoPuppet and cleanup