Simplified callback removal logic