Clean up kvp/data assembly
Track instance counts'