Cleanup Spot creation