Add debug logging to warn on removal