Add some debugging to try and diagnose errors
Cleanup primary item properly on destroy