Fix cascade removal issues