Add destroy dependencies for when a layer or poi is destroyed
Minor cleanup